convert remaining classes to imports (where possible)