"Renamed" & formatted project components

The project isn't so big that it needs individual directories yet :P