Changes to resource/repo structure.Not yet complete