Prepare engine/UI separation