Restructure to match rustpkg