more project structure changes