Replaced a couple of package imports with class imports