fix imports to match new code location