Rename walletimportdat to walletimport and previous wallet import renamed to walletdumpimport. Also cleaned up the code