Some project structure changes