Cleaning up organization of files in repo