Adapt repository structure