Finish add-alias
Move files into correct directory structure
Finish fix-directory