Refactor the repo a bit