Project structure reorganized