Initial Modifications and most recent version

* Modified the Structure
* Using most recent version of openhab (1.6.1)