Updating to new repository structure