Structural changes

Fixing structures for final conversion from Arduino IDE to inotool.