Changed repository structure and names