Re-organization of repository