Folder renaming and file deletes.

lol messed up on a mass revert. :P
Same folder renaming and file updates.
Initial commits