Project structure reorganization