move more files to new project structure