Engine package refactoring V0.2