Engine Refactoring V0.3