Organized files.

Moved files around so that they are actually in the folder that they
belong to. More readable.