Revert "All Zwave updates are now in wave lib"

This reverts commit f8c4c4b16437f524e44cb0b178b7ea64ee608000.
Revert "Revert "All Zwave updates are now in wave lib""

This reverts commit 53521b933350fb173399295faba51275185ecd00.
beautify somes files
beautify some files