Repo reorganizing