Major update :)

Changed locations of quite a few classes, and added to some :P