Project structure reorganized.