Reorganize header file for clean import into Arduino IDE