Fix #62: Change the output repository structure