Move files into correct directory structure
Finish fix-directory