Updating imports and package names