Fix namespaces
Merge branch 'RewriteStructure' of github.com:Z-Wave-Me/home-automation into RewriteStructure
Fix namespaces