Cart class reorganised