Made package core and engine, pieces are now concrete case classes