Restructuring for a flatter layout, removal of unneeded classes.