Move engine submodule into theme_engine