diff --git a/components/net/freemodbus-v1.6.0/Changelog.txt b/components/net/freemodbus/Changelog.txt
similarity index 100%
rename from components/net/freemodbus-v1.6.0/Changelog.txt
rename to components/net/freemodbus/Changelog.txt
diff --git a/components/net/freemodbus-v1.6.0/SConscript b/components/net/freemodbus/SConscript
similarity index 100%
rename from components/net/freemodbus-v1.6.0/SConscript
rename to components/net/freemodbus/SConscript
diff --git a/components/net/freemodbus-v1.6.0/bsd.txt b/components/net/freemodbus/bsd.txt
similarity index 100%
rename from components/net/freemodbus-v1.6.0/bsd.txt
rename to components/net/freemodbus/bsd.txt
diff --git a/components/net/freemodbus-v1.6.0/gpl.txt b/components/net/freemodbus/gpl.txt
similarity index 100%
rename from components/net/freemodbus-v1.6.0/gpl.txt
rename to components/net/freemodbus/gpl.txt
diff --git a/components/net/freemodbus-v1.6.0/lgpl.txt b/components/net/freemodbus/lgpl.txt
similarity index 100%
rename from components/net/freemodbus-v1.6.0/lgpl.txt
rename to components/net/freemodbus/lgpl.txt
diff --git a/components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.c b/components/net/freemodbus/modbus/ascii/mbascii.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.c
rename to components/net/freemodbus/modbus/ascii/mbascii.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.h b/components/net/freemodbus/modbus/ascii/mbascii.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.h
rename to components/net/freemodbus/modbus/ascii/mbascii.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils.c b/components/net/freemodbus/modbus/functions/mbfunccoils.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils.c
rename to components/net/freemodbus/modbus/functions/mbfunccoils.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils_m.c b/components/net/freemodbus/modbus/functions/mbfunccoils_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils_m.c
rename to components/net/freemodbus/modbus/functions/mbfunccoils_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdiag.c b/components/net/freemodbus/modbus/functions/mbfuncdiag.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdiag.c
rename to components/net/freemodbus/modbus/functions/mbfuncdiag.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc.c b/components/net/freemodbus/modbus/functions/mbfuncdisc.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc.c
rename to components/net/freemodbus/modbus/functions/mbfuncdisc.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc_m.c b/components/net/freemodbus/modbus/functions/mbfuncdisc_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc_m.c
rename to components/net/freemodbus/modbus/functions/mbfuncdisc_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding.c b/components/net/freemodbus/modbus/functions/mbfuncholding.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding.c
rename to components/net/freemodbus/modbus/functions/mbfuncholding.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding_m.c b/components/net/freemodbus/modbus/functions/mbfuncholding_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding_m.c
rename to components/net/freemodbus/modbus/functions/mbfuncholding_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput.c b/components/net/freemodbus/modbus/functions/mbfuncinput.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput.c
rename to components/net/freemodbus/modbus/functions/mbfuncinput.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput_m.c b/components/net/freemodbus/modbus/functions/mbfuncinput_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput_m.c
rename to components/net/freemodbus/modbus/functions/mbfuncinput_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncother.c b/components/net/freemodbus/modbus/functions/mbfuncother.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncother.c
rename to components/net/freemodbus/modbus/functions/mbfuncother.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbutils.c b/components/net/freemodbus/modbus/functions/mbutils.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/functions/mbutils.c
rename to components/net/freemodbus/modbus/functions/mbutils.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mb.h b/components/net/freemodbus/modbus/include/mb.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/include/mb.h
rename to components/net/freemodbus/modbus/include/mb.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mb_m.h b/components/net/freemodbus/modbus/include/mb_m.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/include/mb_m.h
rename to components/net/freemodbus/modbus/include/mb_m.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbconfig.h b/components/net/freemodbus/modbus/include/mbconfig.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/include/mbconfig.h
rename to components/net/freemodbus/modbus/include/mbconfig.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbframe.h b/components/net/freemodbus/modbus/include/mbframe.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/include/mbframe.h
rename to components/net/freemodbus/modbus/include/mbframe.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbfunc.h b/components/net/freemodbus/modbus/include/mbfunc.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/include/mbfunc.h
rename to components/net/freemodbus/modbus/include/mbfunc.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbport.h b/components/net/freemodbus/modbus/include/mbport.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/include/mbport.h
rename to components/net/freemodbus/modbus/include/mbport.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbproto.h b/components/net/freemodbus/modbus/include/mbproto.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/include/mbproto.h
rename to components/net/freemodbus/modbus/include/mbproto.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbutils.h b/components/net/freemodbus/modbus/include/mbutils.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/include/mbutils.h
rename to components/net/freemodbus/modbus/include/mbutils.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/mb.c b/components/net/freemodbus/modbus/mb.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/mb.c
rename to components/net/freemodbus/modbus/mb.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/mb_m.c b/components/net/freemodbus/modbus/mb_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/mb_m.c
rename to components/net/freemodbus/modbus/mb_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.c b/components/net/freemodbus/modbus/rtu/mbcrc.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.c
rename to components/net/freemodbus/modbus/rtu/mbcrc.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.h b/components/net/freemodbus/modbus/rtu/mbcrc.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.h
rename to components/net/freemodbus/modbus/rtu/mbcrc.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.c b/components/net/freemodbus/modbus/rtu/mbrtu.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.c
rename to components/net/freemodbus/modbus/rtu/mbrtu.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.h b/components/net/freemodbus/modbus/rtu/mbrtu.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.h
rename to components/net/freemodbus/modbus/rtu/mbrtu.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu_m.c b/components/net/freemodbus/modbus/rtu/mbrtu_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu_m.c
rename to components/net/freemodbus/modbus/rtu/mbrtu_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.c b/components/net/freemodbus/modbus/tcp/mbtcp.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.c
rename to components/net/freemodbus/modbus/tcp/mbtcp.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.h b/components/net/freemodbus/modbus/tcp/mbtcp.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.h
rename to components/net/freemodbus/modbus/tcp/mbtcp.h
diff --git a/components/net/freemodbus-v1.6.0/port/port.c b/components/net/freemodbus/port/port.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/port.c
rename to components/net/freemodbus/port/port.c
diff --git a/components/net/freemodbus-v1.6.0/port/port.h b/components/net/freemodbus/port/port.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/port.h
rename to components/net/freemodbus/port/port.h
diff --git a/components/net/freemodbus-v1.6.0/port/portevent.c b/components/net/freemodbus/port/portevent.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/portevent.c
rename to components/net/freemodbus/port/portevent.c
diff --git a/components/net/freemodbus-v1.6.0/port/portevent_m.c b/components/net/freemodbus/port/portevent_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/portevent_m.c
rename to components/net/freemodbus/port/portevent_m.c
diff --git a/components/net/freemodbus-v1.6.0/port/portserial.c b/components/net/freemodbus/port/portserial.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/portserial.c
rename to components/net/freemodbus/port/portserial.c
diff --git a/components/net/freemodbus-v1.6.0/port/portserial_m.c b/components/net/freemodbus/port/portserial_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/portserial_m.c
rename to components/net/freemodbus/port/portserial_m.c
diff --git a/components/net/freemodbus-v1.6.0/port/porttimer.c b/components/net/freemodbus/port/porttimer.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/porttimer.c
rename to components/net/freemodbus/port/porttimer.c
diff --git a/components/net/freemodbus-v1.6.0/port/porttimer_m.c b/components/net/freemodbus/port/porttimer_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/porttimer_m.c
rename to components/net/freemodbus/port/porttimer_m.c
diff --git a/components/net/freemodbus-v1.6.0/port/user_mb_app.c b/components/net/freemodbus/port/user_mb_app.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/user_mb_app.c
rename to components/net/freemodbus/port/user_mb_app.c
diff --git a/components/net/freemodbus-v1.6.0/port/user_mb_app.h b/components/net/freemodbus/port/user_mb_app.h
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/user_mb_app.h
rename to components/net/freemodbus/port/user_mb_app.h
diff --git a/components/net/freemodbus-v1.6.0/port/user_mb_app_m.c b/components/net/freemodbus/port/user_mb_app_m.c
similarity index 100%
rename from components/net/freemodbus-v1.6.0/port/user_mb_app_m.c
rename to components/net/freemodbus/port/user_mb_app_m.c