Updated to rustpkg format