Restructuring to attempt to fix rustpkg install