Change of plan - revert stuff, rename default to classic