clean up the folders

just move things around