More project structure changes and renaming