Move Order class methos inside their classes