CMS-4087 Introduce Repository

Cleaned up old stuff