Restruct repo