further project structure improvement