Reorganising, created Engine class