Remove z submodule and import module files directly.