Reorganization of the project