Added the user/userrepo + some moving around