Update imports and package name