Refactor to move Repository classes to a package