Final Reorganization of REPO