project structure and renaming