diff --git a/Sming/Components/CommandProcessing/README.rst b/Sming/Libraries/CommandProcessing/README.rst
similarity index 100%
rename from Sming/Components/CommandProcessing/README.rst
rename to Sming/Libraries/CommandProcessing/README.rst
diff --git a/Sming/Components/CommandProcessing/component.mk b/Sming/Libraries/CommandProcessing/component.mk
similarity index 100%
rename from Sming/Components/CommandProcessing/component.mk
rename to Sming/Libraries/CommandProcessing/component.mk
diff --git a/Sming/Components/CommandProcessing/samples/.cs b/Sming/Libraries/CommandProcessing/samples/.cs
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/.cs
rename to Sming/Libraries/CommandProcessing/samples/.cs
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/Makefile b/Sming/Libraries/CommandProcessing/samples/Arducam/Makefile
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/Makefile
rename to Sming/Libraries/CommandProcessing/samples/Arducam/Makefile
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/README.rst b/Sming/Libraries/CommandProcessing/samples/Arducam/README.rst
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/README.rst
rename to Sming/Libraries/CommandProcessing/samples/Arducam/README.rst
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/app/ArduCamCommand.cpp b/Sming/Libraries/CommandProcessing/samples/Arducam/app/ArduCamCommand.cpp
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/app/ArduCamCommand.cpp
rename to Sming/Libraries/CommandProcessing/samples/Arducam/app/ArduCamCommand.cpp
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/app/application.cpp b/Sming/Libraries/CommandProcessing/samples/Arducam/app/application.cpp
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/app/application.cpp
rename to Sming/Libraries/CommandProcessing/samples/Arducam/app/application.cpp
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/component.mk b/Sming/Libraries/CommandProcessing/samples/Arducam/component.mk
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/component.mk
rename to Sming/Libraries/CommandProcessing/samples/Arducam/component.mk
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/include/ArduCamCommand.h b/Sming/Libraries/CommandProcessing/samples/Arducam/include/ArduCamCommand.h
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/include/ArduCamCommand.h
rename to Sming/Libraries/CommandProcessing/samples/Arducam/include/ArduCamCommand.h
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/web/build/Sming.png b/Sming/Libraries/CommandProcessing/samples/Arducam/web/build/Sming.png
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/web/build/Sming.png
rename to Sming/Libraries/CommandProcessing/samples/Arducam/web/build/Sming.png
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/web/build/grids-responsive-min.css b/Sming/Libraries/CommandProcessing/samples/Arducam/web/build/grids-responsive-min.css
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/web/build/grids-responsive-min.css
rename to Sming/Libraries/CommandProcessing/samples/Arducam/web/build/grids-responsive-min.css
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/web/build/index.html b/Sming/Libraries/CommandProcessing/samples/Arducam/web/build/index.html
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/web/build/index.html
rename to Sming/Libraries/CommandProcessing/samples/Arducam/web/build/index.html
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/web/build/layout.css b/Sming/Libraries/CommandProcessing/samples/Arducam/web/build/layout.css
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/web/build/layout.css
rename to Sming/Libraries/CommandProcessing/samples/Arducam/web/build/layout.css
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/web/build/minified.js b/Sming/Libraries/CommandProcessing/samples/Arducam/web/build/minified.js
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/web/build/minified.js
rename to Sming/Libraries/CommandProcessing/samples/Arducam/web/build/minified.js
diff --git a/Sming/Components/CommandProcessing/samples/Arducam/web/build/pure-min.css b/Sming/Libraries/CommandProcessing/samples/Arducam/web/build/pure-min.css
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/Arducam/web/build/pure-min.css
rename to Sming/Libraries/CommandProcessing/samples/Arducam/web/build/pure-min.css
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/Makefile b/Sming/Libraries/CommandProcessing/samples/CommandLine/Makefile
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/Makefile
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/Makefile
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/README.rst b/Sming/Libraries/CommandProcessing/samples/CommandLine/README.rst
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/README.rst
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/README.rst
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/app/application.cpp b/Sming/Libraries/CommandProcessing/samples/CommandLine/app/application.cpp
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/app/application.cpp
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/app/application.cpp
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/component.mk b/Sming/Libraries/CommandProcessing/samples/CommandLine/component.mk
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/component.mk
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/component.mk
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/files/index.html b/Sming/Libraries/CommandProcessing/samples/CommandLine/files/index.html
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/files/index.html
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/files/index.html
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/web/build/bootstrap.css.gz b/Sming/Libraries/CommandProcessing/samples/CommandLine/web/build/bootstrap.css.gz
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/web/build/bootstrap.css.gz
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/web/build/bootstrap.css.gz
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/web/build/index.html b/Sming/Libraries/CommandProcessing/samples/CommandLine/web/build/index.html
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/web/build/index.html
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/web/build/index.html
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/web/build/jquery.js.gz b/Sming/Libraries/CommandProcessing/samples/CommandLine/web/build/jquery.js.gz
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/web/build/jquery.js.gz
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/web/build/jquery.js.gz
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/web/dev/bootstrap.css b/Sming/Libraries/CommandProcessing/samples/CommandLine/web/dev/bootstrap.css
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/web/dev/bootstrap.css
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/web/dev/bootstrap.css
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/web/dev/index.html b/Sming/Libraries/CommandProcessing/samples/CommandLine/web/dev/index.html
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/web/dev/index.html
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/web/dev/index.html
diff --git a/Sming/Components/CommandProcessing/samples/CommandLine/web/dev/jquery.js b/Sming/Libraries/CommandProcessing/samples/CommandLine/web/dev/jquery.js
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/CommandLine/web/dev/jquery.js
rename to Sming/Libraries/CommandProcessing/samples/CommandLine/web/dev/jquery.js
diff --git a/Sming/Components/CommandProcessing/samples/TelnetServer/Makefile b/Sming/Libraries/CommandProcessing/samples/TelnetServer/Makefile
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/TelnetServer/Makefile
rename to Sming/Libraries/CommandProcessing/samples/TelnetServer/Makefile
diff --git a/Sming/Components/CommandProcessing/samples/TelnetServer/README.rst b/Sming/Libraries/CommandProcessing/samples/TelnetServer/README.rst
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/TelnetServer/README.rst
rename to Sming/Libraries/CommandProcessing/samples/TelnetServer/README.rst
diff --git a/Sming/Components/CommandProcessing/samples/TelnetServer/app/application.cpp b/Sming/Libraries/CommandProcessing/samples/TelnetServer/app/application.cpp
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/TelnetServer/app/application.cpp
rename to Sming/Libraries/CommandProcessing/samples/TelnetServer/app/application.cpp
diff --git a/Sming/Components/CommandProcessing/samples/TelnetServer/component.mk b/Sming/Libraries/CommandProcessing/samples/TelnetServer/component.mk
similarity index 100%
rename from Sming/Components/CommandProcessing/samples/TelnetServer/component.mk
rename to Sming/Libraries/CommandProcessing/samples/TelnetServer/component.mk
diff --git a/Sming/Components/CommandProcessing/src/.cs b/Sming/Libraries/CommandProcessing/src/.cs
similarity index 100%
rename from Sming/Components/CommandProcessing/src/.cs
rename to Sming/Libraries/CommandProcessing/src/.cs
diff --git a/Sming/Components/CommandProcessing/src/CommandProcessing/Command.h b/Sming/Libraries/CommandProcessing/src/CommandProcessing/Command.h
similarity index 100%
rename from Sming/Components/CommandProcessing/src/CommandProcessing/Command.h
rename to Sming/Libraries/CommandProcessing/src/CommandProcessing/Command.h
diff --git a/Sming/Components/CommandProcessing/src/CommandProcessing/Handler.cpp b/Sming/Libraries/CommandProcessing/src/CommandProcessing/Handler.cpp
similarity index 100%
rename from Sming/Components/CommandProcessing/src/CommandProcessing/Handler.cpp
rename to Sming/Libraries/CommandProcessing/src/CommandProcessing/Handler.cpp
diff --git a/Sming/Components/CommandProcessing/src/CommandProcessing/Handler.h b/Sming/Libraries/CommandProcessing/src/CommandProcessing/Handler.h
similarity index 100%
rename from Sming/Components/CommandProcessing/src/CommandProcessing/Handler.h
rename to Sming/Libraries/CommandProcessing/src/CommandProcessing/Handler.h
diff --git a/Sming/Components/CommandProcessing/src/CommandProcessing/Utils.cpp b/Sming/Libraries/CommandProcessing/src/CommandProcessing/Utils.cpp
similarity index 100%
rename from Sming/Components/CommandProcessing/src/CommandProcessing/Utils.cpp
rename to Sming/Libraries/CommandProcessing/src/CommandProcessing/Utils.cpp
diff --git a/Sming/Components/CommandProcessing/src/CommandProcessing/Utils.h b/Sming/Libraries/CommandProcessing/src/CommandProcessing/Utils.h
similarity index 100%
rename from Sming/Components/CommandProcessing/src/CommandProcessing/Utils.h
rename to Sming/Libraries/CommandProcessing/src/CommandProcessing/Utils.h