diff --git a/esp-link/cgioptiboot.c b/esp-link/cgiadv/cgioptiboot.c
similarity index 100%
rename from esp-link/cgioptiboot.c
rename to esp-link/cgiadv/cgioptiboot.c
diff --git a/esp-link/cgioptiboot.h b/esp-link/cgiadv/cgioptiboot.h
similarity index 100%
rename from esp-link/cgioptiboot.h
rename to esp-link/cgiadv/cgioptiboot.h
diff --git a/esp-link/cgipins.c b/esp-link/cgiadv/cgipins.c
similarity index 100%
rename from esp-link/cgipins.c
rename to esp-link/cgiadv/cgipins.c
diff --git a/esp-link/cgipins.h b/esp-link/cgiadv/cgipins.h
similarity index 100%
rename from esp-link/cgipins.h
rename to esp-link/cgiadv/cgipins.h
diff --git a/esp-link/cgitcp.c b/esp-link/cgiadv/cgitcp.c
similarity index 100%
rename from esp-link/cgitcp.c
rename to esp-link/cgiadv/cgitcp.c
diff --git a/esp-link/cgitcp.h b/esp-link/cgiadv/cgitcp.h
similarity index 100%
rename from esp-link/cgitcp.h
rename to esp-link/cgiadv/cgitcp.h
diff --git a/esp-link/stk500.h b/esp-link/cgiadv/stk500.h
similarity index 100%
rename from esp-link/stk500.h
rename to esp-link/cgiadv/stk500.h
diff --git a/esp-link/log.c b/esp-link/log/log.c
similarity index 100%
rename from esp-link/log.c
rename to esp-link/log/log.c
diff --git a/esp-link/log.h b/esp-link/log/log.h
similarity index 100%
rename from esp-link/log.h
rename to esp-link/log/log.h
diff --git a/serial/console.c b/serial/console/console.c
similarity index 100%
rename from serial/console.c
rename to serial/console/console.c
diff --git a/serial/console.h b/serial/console/console.h
similarity index 100%
rename from serial/console.h
rename to serial/console/console.h
diff --git a/serial/serbridge.c b/serial/serbridge/serbridge.c
similarity index 100%
rename from serial/serbridge.c
rename to serial/serbridge/serbridge.c
diff --git a/serial/serbridge.h b/serial/serbridge/serbridge.h
similarity index 100%
rename from serial/serbridge.h
rename to serial/serbridge/serbridge.h
diff --git a/serial/slip.c b/serial/serbridge/slip.c
similarity index 100%
rename from serial/slip.c
rename to serial/serbridge/slip.c
diff --git a/serial/slip.h b/serial/serbridge/slip.h
similarity index 100%
rename from serial/slip.h
rename to serial/serbridge/slip.h