Major restructuring of repository