Changed files to match Repo restructuring