Repo reorganization