Updated repository structure