Changes for the new repository structure