project structure reorganization [2]