Started migrating shared code to jgenui-wrap