Moved the engine in a separate package