diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/Socket_APIs_V3.0.3.chm b/Ethernet/Socket_APIs_V3.0.3.chm
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/Socket_APIs_V3.0.3.chm
rename to Ethernet/Socket_APIs_V3.0.3.chm
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5100/w5100.c b/Ethernet/W5100/w5100.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5100/w5100.c
rename to Ethernet/W5100/w5100.c
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5100/w5100.h b/Ethernet/W5100/w5100.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5100/w5100.h
rename to Ethernet/W5100/w5100.h
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5100S/w5100s.c b/Ethernet/W5100S/w5100s.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5100S/w5100s.c
rename to Ethernet/W5100S/w5100s.c
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5100S/w5100s.h b/Ethernet/W5100S/w5100s.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5100S/w5100s.h
rename to Ethernet/W5100S/w5100s.h
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5200/w5200.c b/Ethernet/W5200/w5200.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5200/w5200.c
rename to Ethernet/W5200/w5200.c
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5200/w5200.h b/Ethernet/W5200/w5200.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5200/w5200.h
rename to Ethernet/W5200/w5200.h
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5300/w5300.c b/Ethernet/W5300/w5300.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5300/w5300.c
rename to Ethernet/W5300/w5300.c
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5300/w5300.h b/Ethernet/W5300/w5300.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5300/w5300.h
rename to Ethernet/W5300/w5300.h
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5500/w5500.c b/Ethernet/W5500/w5500.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5500/w5500.c
rename to Ethernet/W5500/w5500.c
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/W5500/w5500.h b/Ethernet/W5500/w5500.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/W5500/w5500.h
rename to Ethernet/W5500/w5500.h
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/socket.c b/Ethernet/socket.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/socket.c
rename to Ethernet/socket.c
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/socket.h b/Ethernet/socket.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/socket.h
rename to Ethernet/socket.h
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/wizchip_conf.c b/Ethernet/wizchip_conf.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/wizchip_conf.c
rename to Ethernet/wizchip_conf.c
diff --git a/22_m1284p_WIZNET_MQTT/Ethernet/wizchip_conf.h b/Ethernet/wizchip_conf.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Ethernet/wizchip_conf.h
rename to Ethernet/wizchip_conf.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTClient.c b/Internet/MQTT/MQTTClient.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTClient.c
rename to Internet/MQTT/MQTTClient.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTClient.h b/Internet/MQTT/MQTTClient.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTClient.h
rename to Internet/MQTT/MQTTClient.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTConnect.h b/Internet/MQTT/MQTTPacket/src/MQTTConnect.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTConnect.h
rename to Internet/MQTT/MQTTPacket/src/MQTTConnect.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTConnectClient.c b/Internet/MQTT/MQTTPacket/src/MQTTConnectClient.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTConnectClient.c
rename to Internet/MQTT/MQTTPacket/src/MQTTConnectClient.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTConnectServer.c b/Internet/MQTT/MQTTPacket/src/MQTTConnectServer.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTConnectServer.c
rename to Internet/MQTT/MQTTPacket/src/MQTTConnectServer.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTDeserializePublish.c b/Internet/MQTT/MQTTPacket/src/MQTTDeserializePublish.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTDeserializePublish.c
rename to Internet/MQTT/MQTTPacket/src/MQTTDeserializePublish.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTFormat.c b/Internet/MQTT/MQTTPacket/src/MQTTFormat.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTFormat.c
rename to Internet/MQTT/MQTTPacket/src/MQTTFormat.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTFormat.h b/Internet/MQTT/MQTTPacket/src/MQTTFormat.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTFormat.h
rename to Internet/MQTT/MQTTPacket/src/MQTTFormat.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTPacket.c b/Internet/MQTT/MQTTPacket/src/MQTTPacket.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTPacket.c
rename to Internet/MQTT/MQTTPacket/src/MQTTPacket.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTPacket.h b/Internet/MQTT/MQTTPacket/src/MQTTPacket.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTPacket.h
rename to Internet/MQTT/MQTTPacket/src/MQTTPacket.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTPublish.h b/Internet/MQTT/MQTTPacket/src/MQTTPublish.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTPublish.h
rename to Internet/MQTT/MQTTPacket/src/MQTTPublish.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTSerializePublish.c b/Internet/MQTT/MQTTPacket/src/MQTTSerializePublish.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTSerializePublish.c
rename to Internet/MQTT/MQTTPacket/src/MQTTSerializePublish.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTSubscribe.h b/Internet/MQTT/MQTTPacket/src/MQTTSubscribe.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTSubscribe.h
rename to Internet/MQTT/MQTTPacket/src/MQTTSubscribe.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTSubscribeClient.c b/Internet/MQTT/MQTTPacket/src/MQTTSubscribeClient.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTSubscribeClient.c
rename to Internet/MQTT/MQTTPacket/src/MQTTSubscribeClient.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTSubscribeServer.c b/Internet/MQTT/MQTTPacket/src/MQTTSubscribeServer.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTSubscribeServer.c
rename to Internet/MQTT/MQTTPacket/src/MQTTSubscribeServer.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribe.h b/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribe.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribe.h
rename to Internet/MQTT/MQTTPacket/src/MQTTUnsubscribe.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribeClient.c b/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribeClient.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribeClient.c
rename to Internet/MQTT/MQTTPacket/src/MQTTUnsubscribeClient.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribeServer.c b/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribeServer.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/MQTTUnsubscribeServer.c
rename to Internet/MQTT/MQTTPacket/src/MQTTUnsubscribeServer.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/StackTrace.h b/Internet/MQTT/MQTTPacket/src/StackTrace.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/MQTTPacket/src/StackTrace.h
rename to Internet/MQTT/MQTTPacket/src/StackTrace.h
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/mqtt_interface.c b/Internet/MQTT/mqtt_interface.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/mqtt_interface.c
rename to Internet/MQTT/mqtt_interface.c
diff --git a/22_m1284p_WIZNET_MQTT/Internet/MQTT/mqtt_interface.h b/Internet/MQTT/mqtt_interface.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Internet/MQTT/mqtt_interface.h
rename to Internet/MQTT/mqtt_interface.h
diff --git a/22_m1284p_WIZNET_MQTT/Makefile b/Makefile
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/Makefile
rename to Makefile
diff --git a/22_m1284p_WIZNET_MQTT/avrIOhelper/io-helper.c b/avrIOhelper/io-helper.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/avrIOhelper/io-helper.c
rename to avrIOhelper/io-helper.c
diff --git a/22_m1284p_WIZNET_MQTT/avrIOhelper/io-helper.h b/avrIOhelper/io-helper.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/avrIOhelper/io-helper.h
rename to avrIOhelper/io-helper.h
diff --git a/22_m1284p_WIZNET_MQTT/avrIOhelper/iohelperhelper.py b/avrIOhelper/iohelperhelper.py
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/avrIOhelper/iohelperhelper.py
rename to avrIOhelper/iohelperhelper.py
diff --git a/22_m1284p_WIZNET_MQTT/main.c b/main.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/main.c
rename to main.c
diff --git a/22_m1284p_WIZNET_MQTT/millis.c b/millis.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/millis.c
rename to millis.c
diff --git a/22_m1284p_WIZNET_MQTT/millis.h b/millis.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/millis.h
rename to millis.h
diff --git a/22_m1284p_WIZNET_MQTT/mqtt.c b/mqtt.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/mqtt.c
rename to mqtt.c
diff --git a/22_m1284p_WIZNET_MQTT/mqtt.h b/mqtt.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/mqtt.h
rename to mqtt.h
diff --git a/22_m1284p_WIZNET_MQTT/spi.c b/spi.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/spi.c
rename to spi.c
diff --git a/22_m1284p_WIZNET_MQTT/spi.h b/spi.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/spi.h
rename to spi.h
diff --git a/22_m1284p_WIZNET_MQTT/uart.c b/uart.c
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/uart.c
rename to uart.c
diff --git a/22_m1284p_WIZNET_MQTT/uart.h b/uart.h
similarity index 100%
rename from 22_m1284p_WIZNET_MQTT/uart.h
rename to uart.h