Re-organised sensor config keys/default values