Change the package structure to work with rustpkg
Update to work with the HEAD of rust