diff --git a/Devices/ConfigFileFormat.odt b/Devices/ConfigFileFormat.odt
new file mode 100644
index 0000000000000000000000000000000000000000..8a2313ea19a1ba83c6a8aa1f24d2eedbc82e9abf
Binary files /dev/null and b/Devices/ConfigFileFormat.odt differ
diff --git a/Devices/ConfigFileSpecification/ConfigFileFormat_3PortModels.doc b/Devices/ConfigFileSpecification/ConfigFileFormat_3PortModels.doc
new file mode 100644
index 0000000000000000000000000000000000000000..9cc36cc8e5b96028dcea1eb4021be8bb6c116aa0
Binary files /dev/null and b/Devices/ConfigFileSpecification/ConfigFileFormat_3PortModels.doc differ
diff --git a/Devices/data/eth8888-responses.formatted.txt b/Devices/data/eth8888-responses.formatted.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d71e6e06435dff605972b8f58083da5ab05d6219
--- /dev/null
+++ b/Devices/data/eth8888-responses.formatted.txt
@@ -0,0 +1,39 @@
+Frame 1: 30 bytes on wire (240 bits), 30 bytes captured (240 bits)
+Ethernet II, Src: CompalCo_4d:6a:09 (00:16:d4:), Dst: Broadcast
+
+0000  ff ff ff ff ff ff 00 16 d4 4d 6a 09 88 88 00 00   .........Mj.....
+0010  00 00 00 00 00 00 00 00 00 00 00 00 00 00         ..............
+
+
+
+Frame 2: 80 bytes on wire (640 bits), 80 bytes captured (640 bits)
+Ethernet II, Src: TigerNet_11:fc:d0 (00:17:13:), Dst: CompalCo_4d:6a:09 (00:16:d4:)
+
+Frame 3: 680 bytes on wire (5440 bits), 680 bytes captured (5440 bits)
+Ethernet II, Src: HewlettP_a0:0b:a9 (00:17:08:), Dst: CompalCo_4d:6a:09 (00:16:d4:)
+
+Frame 4: 680 bytes on wire (5440 bits), 680 bytes captured (5440 bits)
+Ethernet II, Src: HewlettP_9e:2d:2f (00:17:08:), Dst: CompalCo_4d:6a:09 (00:16:d4:)
+
+
+
+vap11g:    0000  00 16 d4 4d 6a 09 00 17 13 11 fc d0 88 88 00 00   ...Mj...........
+hp2101nw1: 0000  00 16 d4 4d 6a 09 00 17 08 a0 0b a9 88 88 00 00   ...Mj...........
+hp2101nw2: 0000  00 16 d4 4d 6a 09 00 17 08 9e 2d 2f 88 88 00 00   ....y.....-/....
+
+vap11g:    0010  00 00 00 00 00 00 38 00 00 01 00 00 04 e0 54 00   ......8.......T.
+hp2101nw1: 0010  00 00 00 00 00 00 38 00 00 01 00 00 59 4a 34 8c   ......8.....YJ4.
+hp2101nw2: 0010  00 00 00 00 00 00 38 00 00 01 00 00 59 4a 34 8c   ......8.....YJ4.
+
+vap11g:    0020  01 10 00 00 00 00 00 a8 98 95 a8 cb 9c e5 c9 ca   ................
+hp2101nw1: 0020  2c 00 00 60 00 00 00 00 00 00 00 00 00 00 00 00   ,..`............
+hp2101nw2: 0020  2c 00 00 60 00 00 00 00 00 00 00 00 00 00 00 00   ,..`............
+
+vap11g:    0030  e8 e5 cd cc e2 e9 cd 00 00 00 00 00 00 00 08 12   ................
+hp2101nw1: 0030  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+hp2101nw2: 0030  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+
+vap11g:    0040  00 00 80 00 00 00 00 00 00 00 10 04 00 00 00 04   ................
+hp2101nw1: 0040  00 01 80 42 00 00 00 00 00 00 14 04 00 00 00 04   ...B............
+hp2101nw2: 0040  00 01 80 42 00 00 00 00 00 00 14 03 00 00 00 04   ...B............
+
diff --git a/Devices/data/eth8888-responses.txt b/Devices/data/eth8888-responses.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1b6b9f8d766b0c0e1c403ba1658aef9f8f7923a1
--- /dev/null
+++ b/Devices/data/eth8888-responses.txt
@@ -0,0 +1,124 @@
+No.     Time        Source                Destination           
+      1 0.000000    CompalCo_4d:6a:09     Broadcast             
+
+Frame 1: 30 bytes on wire (240 bits), 30 bytes captured (240 bits)
+Ethernet II, Src: CompalCo_4d:6a:09 (00:16:d4:4d:6a:09), Dst: Broadcast (ff:ff:ff:ff:ff:ff)
+VAP11G device configuration
+
+0000  ff ff ff ff ff ff 00 16 d4 4d 6a 09 88 88 00 00   .........Mj.....
+0010  00 00 00 00 00 00 00 00 00 00 00 00 00 00         ..............
+
+No.     Time        Source                Destination           
+      2 0.000314    TigerNet_11:fc:d0     CompalCo_4d:6a:09     
+
+Frame 2: 80 bytes on wire (640 bits), 80 bytes captured (640 bits)
+Ethernet II, Src: TigerNet_11:fc:d0 (00:17:13:11:fc:d0), Dst: CompalCo_4d:6a:09 (00:16:d4:4d:6a:09)
+VAP11G device configuration
+
+0000  00 16 d4 4d 6a 09 00 17 13 11 fc d0 88 88 00 00   ...Mj...........
+0010  00 00 00 00 00 00 38 00 00 01 00 00 04 e0 54 00   ......8.......T.
+0020  01 10 00 00 00 00 00 a8 98 95 a8 cb 9c e5 c9 ca   ................
+0030  e8 e5 cd cc e2 e9 cd 00 00 00 00 00 00 00 08 12   ................
+0040  00 00 80 00 00 00 00 00 00 00 10 04 00 00 00 04   ................
+
+No.     Time        Source                Destination           
+      4 0.070433    HewlettP_a0:0b:a9     CompalCo_4d:6a:09     
+
+Frame 4: 680 bytes on wire (5440 bits), 680 bytes captured (5440 bits)
+Ethernet II, Src: HewlettP_a0:0b:a9 (00:17:08:a0:0b:a9), Dst: CompalCo_4d:6a:09 (00:16:d4:4d:6a:09)
+VAP11G device configuration
+
+0000  00 16 d4 4d 6a 09 00 17 08 a0 0b a9 88 88 00 00   ...Mj...........
+0010  00 00 00 00 00 00 38 00 00 01 00 00 59 4a 34 8c   ......8.....YJ4.
+0020  2c 00 00 60 00 00 00 00 00 00 00 00 00 00 00 00   ,..`............
+0030  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0040  00 01 80 42 00 00 00 00 00 00 14 04 00 00 00 04   ...B............
+0050  06 04 00 03 00 17 08 a0 0b a9 00 00 00 00 00 17   ................
+0060  08 a0 0b a9 00 00 00 00 50 54 41 30 30 42 41 32   ........PTA00BA2
+0070  0a 30 30 31 32 20 54 43 50 49 50 5f 50 20 3a 45   .0012 TCPIP_P :E
+0080  6e 61 62 6c 65 0a 30 31 30 30 20 4c 31 5f 50 52   nable.0100 L1_PR
+0090  4f 55 54 3a 50 31 0a 30 31 30 31 20 4c 31 5f 50   OUT:P1.0101 L1_P
+00a0  52 45 53 54 3a 0a 30 31 30 32 20 4c 31 5f 50 4f   REST:.0102 L1_PO
+00b0  53 54 52 3a 0a 30 31 30 33 20 4c 31 5f 43 48 47   STR:.0103 L1_CHG
+00c0  4c 46 3a 4e 6f 0a 30 31 32 30 20 4c 32 5f 50 52   LF:No.0120 L2_PR
+00d0  4f 55 54 3a 50 31 0a 30 31 32 31 20 4c 32 5f 50   OUT:P1.0121 L2_P
+00e0  52 45 53 54 3a 0a 30 31 32 32 20 4c 32 5f 50 4f   REST:.0122 L2_PO
+00f0  53 54 52 3a 0a 30 31 32 33 20 4c 32 5f 43 48 47   STR:.0123 L2_CHG
+0100  4c 46 3a 4e 6f 0a 30 31 34 30 20 4c 33 5f 50 52   LF:No.0140 L3_PR
+0110  4f 55 54 3a 50 31 0a 30 31 34 31 20 4c 33 5f 50   OUT:P1.0141 L3_P
+0120  52 45 53 54 3a 0a 30 31 34 32 20 4c 33 5f 50 4f   REST:.0142 L3_PO
+0130  53 54 52 3a 0a 30 31 34 33 20 4c 33 5f 43 48 47   STR:.0143 L3_CHG
+0140  4c 46 3a 4e 6f 0a 34 30 30 30 20 49 50 5f 41 44   LF:No.4000 IP_AD
+0150  44 52 3a 31 30 2e 30 2e 30 2e 32 38 0a 34 30 30   DR:10.0.0.28.400
+0160  31 20 47 41 54 45 57 41 59 3a 31 30 2e 30 2e 30   1 GATEWAY:10.0.0
+0170  2e 31 33 38 0a 34 30 30 32 20 4d 41 53 4b 20 20   .138.4002 MASK  
+0180  20 3a 32 35 35 2e 32 35 35 2e 32 35 35 2e 30 0a    :255.255.255.0.
+0190  34 30 31 30 20 54 43 50 5f 49 4e 54 3a 30 0a 34   4010 TCP_INT:0.4
+01a0  30 31 31 20 54 43 50 5f 43 4e 54 3a 30 0a 34 30   011 TCP_CNT:0.40
+01b0  31 32 20 57 49 4e 53 5f 49 50 3a 30 2e 30 2e 30   12 WINS_IP:0.0.0
+01c0  2e 30 0a 34 30 32 30 20 44 48 43 50 5f 4d 4f 44   .0.4020 DHCP_MOD
+01d0  45 3a 45 6e 61 62 6c 65 0a 37 30 30 30 20 53 53   E:Enable.7000 SS
+01e0  49 44 3a 6b 61 69 6e 68 6f 66 65 72 0a 37 30 30   ID:kainhofer.700
+01f0  31 20 44 4f 4d 41 49 4e 3a 31 30 0a 37 30 30 32   1 DOMAIN:10.7002
+0200  20 43 48 41 4e 4e 45 4c 3a 36 0a 37 30 30 33 20    CHANNEL:6.7003 
+0210  53 45 43 4d 4f 44 45 3a 32 0a 37 30 30 34 20 4b   SECMODE:2.7004 K
+0220  45 59 5f 4c 45 4e 3a 30 0a 37 30 30 35 20 44 45   EY_LEN:0.7005 DE
+0230  46 41 55 4c 54 4b 45 59 3a 30 0a 37 30 30 36 20   FAULTKEY:0.7006 
+0240  4b 45 59 30 3a 0a 37 30 30 37 20 4b 45 59 31 3a   KEY0:.7007 KEY1:
+0250  0a 37 30 30 38 20 4b 45 59 32 3a 0a 37 30 30 39   .7008 KEY2:.7009
+0260  20 4b 45 59 33 3a 0a 37 30 31 32 20 41 55 54 48    KEY3:.7012 AUTH
+0270  45 4e 3a 30 0a 37 30 31 33 20 4d 4f 44 45 3a 30   EN:0.7013 MODE:0
+0280  0a 37 30 31 34 20 4c 49 4e 4b 49 4e 46 4f 3a 53   .7014 LINKINFO:S
+0290  54 41 54 45 3a 41 73 73 6f 63 69 61 74 65 64 20   TATE:Associated 
+02a0  2d 20 42 53 53 20 49 44                           - BSS ID
+
+No.     Time        Source                Destination           
+      2 0.013482    HewlettP_9e:2d:2f     IntelCor_e3:79:06     
+
+Frame 2: 680 bytes on wire (5440 bits), 680 bytes captured (5440 bits)
+Ethernet II, Src: HewlettP_9e:2d:2f (00:17:08:9e:2d:2f), Dst: IntelCor_e3:79:06 (00:13:02:e3:79:06)
+VAP11G device configuration
+
+0000  00 13 02 e3 79 06 00 17 08 9e 2d 2f 88 88 00 00   ....y.....-/....
+0010  00 00 00 00 00 00 38 00 00 01 00 00 59 4a 34 8c   ......8.....YJ4.
+0020  2c 00 00 60 00 00 00 00 00 00 00 00 00 00 00 00   ,..`............
+0030  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0040  00 01 80 42 00 00 00 00 00 00 14 03 00 00 00 04   ...B............
+0050  06 04 00 03 00 17 08 9e 2d 2f 00 00 00 00 00 17   ........-/......
+0060  08 9e 2d 2f 00 00 00 00 00 00 00 00 00 00 00 00   ..-/............
+0070  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0080  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0090  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+00a0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+00b0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+00c0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+00d0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+00e0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+00f0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0100  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0110  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0120  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0130  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0140  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0150  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0160  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0170  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0180  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0190  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+01a0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+01b0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+01c0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+01d0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+01e0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+01f0  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0200  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0210  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0220  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0230  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0240  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0250  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0260  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0270  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0280  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+0290  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
+02a0  00 00 00 00 00 00 00 00                           ........
diff --git a/appliance_setup/data/2012-02-09_VAP11G.conf b/appliance_setup/data/2012-02-09_VAP11G.conf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/appliance_setup/data/2012-02-13_VAP11G_wlan.conf b/appliance_setup/data/2012-02-13_VAP11G_wlan.conf
new file mode 100644
index 0000000000000000000000000000000000000000..43ab6eb7f24841580080f0373c858434e56b1884
--- /dev/null
+++ b/appliance_setup/data/2012-02-13_VAP11G_wlan.conf
@@ -0,0 +1,21 @@
+0001 BOX_NAME:VAP11G
+0002 MAC_ADDR:00171311FCD0
+7000 SSID:kainhofer
+7001 DOMAIN:16
+7002 CHANNEL:6
+7003 SECMODE:2
+7004 KEY_LEN:32
+7005 DEFAULTKEY:0
+7006 KEY0:0000000000000000000000000000000000000000000000000000000000000000
+7007 KEY1:0000000000000000000000000000000000000000000000000000000000000000
+7008 KEY2:0000000000000000000000000000000000000000000000000000000000036400
+7009 KEY3:0000000000000000000000000000000364002B092A0900000000000000000000
+7012 AUTHEN:3
+7013 MODE:0
+7014 LINKINFO:SSID:kainhoferSTATE:Connected (Infrastructure)BSS ID = 00:15:F2:3D:79:06CHANNEL:6SECURITY:2TX:0RX:680QUALITY:Excellent(100%)STRENGTH:Excellent(85%)
+7017 WPA:WPA2
+7018 PSKALSET:0
+7019 PSKKEY:reinhold
+7020 PSKAL:TKIP;
+7021 SURVEY:kainhofer0015f23d7906,6,G,2,100tunetb4a4e3b4f723,5,G,0,500002a8d27414,6,G,2,10wlanipsecb4a4e3b4f721,5,G,0,60eduroamb4a4e3b4f720,5,G,3,50myLGNet74170002a8d27415,6,G,1,10CK4D002436b7918b,11,G,1,10amaci.at001d7e30d80b,6,G,3,10DSMAURORA001ae302b3a0,1,G,2,20UPC011025001e6962d1fa,1,G,3,10DSMGUEST001ae302b3a1,1,G,0,10wlanipsecb4a4e3ca30a1,1,G,0,10tunetb4a4e3ca30a3,1,G,0,10eduroamb4a4e3ca30a0,1,G,3,10SpeedTouch91C5090024d26c2572,6,G,3,10001f412a4ec0,6,G,2,10AndroidAP980c825ac6d2,6,G,3,10
+7022 BAND:0
diff --git a/appliance_setup/data/2012-02-18_HP2101nw_001708A00BA9.conf b/appliance_setup/data/2012-02-18_HP2101nw_001708A00BA9.conf
new file mode 100644
index 0000000000000000000000000000000000000000..4737cdd9d2e138d595327d9a470fc083d5f1cb80
--- /dev/null
+++ b/appliance_setup/data/2012-02-18_HP2101nw_001708A00BA9.conf
@@ -0,0 +1,55 @@
+0001 BOX_NAME:WPTA00BA9
+0012 TCPIP_P :Enable
+0100 L1_PROUT:P1
+0101 L1_PREST:
+0102 L1_POSTR:
+0103 L1_CHGLF:No
+0120 L2_PROUT:P1
+0121 L2_PREST:
+0122 L2_POSTR:
+0123 L2_CHGLF:No
+0140 L3_PROUT:P1
+0141 L3_PREST:
+0142 L3_POSTR:
+0143 L3_CHGLF:No
+4000 IP_ADDR:10.0.0.3
+4001 GATEWAY:10.0.0.138
+4002 MASK   :255.255.255.0
+4010 TCP_INT:0
+4011 TCP_CNT:0
+4012 WINS_IP:0.0.0.0
+4020 DHCP_MODE:Enable
+7000 SSID:kainhofer
+7001 DOMAIN:10
+7002 CHANNEL:1
+7003 SECMODE:2
+7004 KEY_LEN:0
+7005 DEFAULTKEY:0
+7006 KEY0:
+7007 KEY1:
+7008 KEY2:
+7009 KEY3:
+7012 AUTHEN:0
+7013 MODE:0
+7014 LINKINFO:STATE:Associated - BSS ID = 30:39:F2:52:AD:76;SSID:kainhofer;CHANNEL:1;TXRATE:54;TX:0;RX:168;QUALITY:Good(50%);STRENGTH:Good(50%);
+7017 WPA:WPA2
+7018 PSKALSET:0
+7019 PSKKEY:reinhold
+7020 PSKAL:TKIP;AES;
+7021 SURVEY:
+7023 WPA2AL:TKIP;AES;
+7024 STAMODE:0
+7025 APCHANNEL:5
+7026 CHMODE:1
+7030 WLMODE:0
+7100 APSSID:kainhoc
+7103 APSECMODE:0
+7104 APKEY_LEN:0
+7105 APDEFAULTKE:0
+7106 APKEY0:
+7107 APKEY1:
+7108 APKEY2:
+7109 APKEY3:
+7112 APAUTHEN:0
+7118 APPSKALSET:1
+7119 APPSKKEY:
diff --git a/appliance_setup/device_types.py b/appliance_setup/device_types.py
old mode 100755
new mode 100644
diff --git a/appliance_setup/helpers.py b/appliance_setup/helpers.py
old mode 100755
new mode 100644
diff --git a/appliance_setup/user_interface.py b/appliance_setup/user_interface.py
old mode 100755
new mode 100644