Re-structure repository