project structure reorganization