Repository Reformat Take 2