minor changes
fixing imports of classes from other packages