Further work on repos and general structure