project structure reorganization [3]