split fix engine  into common and server side API