Move files to correct directory structure, delete crud