Fix up imports and not import *.Class modules