Revert "Optimize repository layout"

This reverts commit 6d56d7d4c695bee7644eef1aaeab32b4ff3dadac, because it
slowed down accessing and removing blobs a lot.