More project structure changes