More Changes

Renamed/organized a bit, as well as added a new folder in the base
directory called hooks which I might have plans for.