Renaming and moving to folders

Mostly organizing and moving things to folders.