Update imports and package declarations to the new namespace