slight repo reorganization