Removed unnecessary order item class, add customer class