Restructuring for 1.6
Bringing up to snuff for Arduino 1.5x / 1.6. Not working in Windows yet - can't figure out why.