Top level changes

Removing 2012 and the top level fudge