Reorganization of the repository (again)