Some more repositories and more refactoring