Reorganization of the repository (more)