Manual reset to commit "Restructuring" (2012-01-24)