Add only move extension, some refactoring
Update engine.h