OH2 Z-Wave refactoring and testing... and SECURITY

Yes, and Yes…