project structure reorganization [4]