add compat file and fix imports and moves