Move Repos into a manager and use entities