Improve keypairs management, helps, config management

Change-Id: I4a1cbde54dde8231bfcf9e9eb85a04714edfa1a2