moving to new repository structure