Change engine to new database layout, with separate working dir and run command