Initial project structure changes