More work on repository structure