fixing problems with class imports