Move some things around, restructure folders
Move around some more files
Cleaning things up further