change imports and class calls