Adjusted imports to changes in package structure