diff --git a/src/utils/meson.build b/src/common/meson.build
similarity index 100%
rename from src/utils/meson.build
rename to src/common/meson.build
diff --git a/src/utils/tvgArray.h b/src/common/tvgArray.h
similarity index 100%
rename from src/utils/tvgArray.h
rename to src/common/tvgArray.h
diff --git a/src/utils/tvgBezier.cpp b/src/common/tvgBezier.cpp
similarity index 100%
rename from src/utils/tvgBezier.cpp
rename to src/common/tvgBezier.cpp
diff --git a/src/utils/tvgBezier.h b/src/common/tvgBezier.h
similarity index 100%
rename from src/utils/tvgBezier.h
rename to src/common/tvgBezier.h
diff --git a/src/utils/tvgCompressor.cpp b/src/common/tvgCompressor.cpp
similarity index 100%
rename from src/utils/tvgCompressor.cpp
rename to src/common/tvgCompressor.cpp
diff --git a/src/utils/tvgCompressor.h b/src/common/tvgCompressor.h
similarity index 100%
rename from src/utils/tvgCompressor.h
rename to src/common/tvgCompressor.h
diff --git a/src/utils/tvgList.h b/src/common/tvgList.h
similarity index 100%
rename from src/utils/tvgList.h
rename to src/common/tvgList.h
diff --git a/src/utils/tvgMath.cpp b/src/common/tvgMath.cpp
similarity index 100%
rename from src/utils/tvgMath.cpp
rename to src/common/tvgMath.cpp
diff --git a/src/utils/tvgMath.h b/src/common/tvgMath.h
similarity index 100%
rename from src/utils/tvgMath.h
rename to src/common/tvgMath.h
diff --git a/src/utils/tvgStr.cpp b/src/common/tvgStr.cpp
similarity index 100%
rename from src/utils/tvgStr.cpp
rename to src/common/tvgStr.cpp
diff --git a/src/utils/tvgStr.h b/src/common/tvgStr.h
similarity index 100%
rename from src/utils/tvgStr.h
rename to src/common/tvgStr.h
diff --git a/src/meson.build b/src/meson.build
index 3172204c..9b9d0cff 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -36,9 +36,8 @@ elif (cc.get_id() != 'msvc')
     endif
 endif
 
-
-subdir('lib')
-subdir('utils')
+subdir('common')
+subdir('renderer')
 subdir('loaders')
 subdir('savers')
 
@@ -71,7 +70,7 @@ pkg_mod.generate(
     description  : 'A Thor library for rendering vector graphics'
 )
 
-subdir('bin')
+subdir('tools')
 
 if get_option('examples') == true
     subdir('examples')
diff --git a/src/lib/gl_engine/meson.build b/src/renderer/gl_engine/meson.build
similarity index 100%
rename from src/lib/gl_engine/meson.build
rename to src/renderer/gl_engine/meson.build
diff --git a/src/lib/gl_engine/tvgGlCommon.h b/src/renderer/gl_engine/tvgGlCommon.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlCommon.h
rename to src/renderer/gl_engine/tvgGlCommon.h
diff --git a/src/lib/gl_engine/tvgGlGeometry.cpp b/src/renderer/gl_engine/tvgGlGeometry.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlGeometry.cpp
rename to src/renderer/gl_engine/tvgGlGeometry.cpp
diff --git a/src/lib/gl_engine/tvgGlGeometry.h b/src/renderer/gl_engine/tvgGlGeometry.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlGeometry.h
rename to src/renderer/gl_engine/tvgGlGeometry.h
diff --git a/src/lib/gl_engine/tvgGlGpuBuffer.cpp b/src/renderer/gl_engine/tvgGlGpuBuffer.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlGpuBuffer.cpp
rename to src/renderer/gl_engine/tvgGlGpuBuffer.cpp
diff --git a/src/lib/gl_engine/tvgGlGpuBuffer.h b/src/renderer/gl_engine/tvgGlGpuBuffer.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlGpuBuffer.h
rename to src/renderer/gl_engine/tvgGlGpuBuffer.h
diff --git a/src/lib/gl_engine/tvgGlProgram.cpp b/src/renderer/gl_engine/tvgGlProgram.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlProgram.cpp
rename to src/renderer/gl_engine/tvgGlProgram.cpp
diff --git a/src/lib/gl_engine/tvgGlProgram.h b/src/renderer/gl_engine/tvgGlProgram.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlProgram.h
rename to src/renderer/gl_engine/tvgGlProgram.h
diff --git a/src/lib/gl_engine/tvgGlPropertyInterface.cpp b/src/renderer/gl_engine/tvgGlPropertyInterface.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlPropertyInterface.cpp
rename to src/renderer/gl_engine/tvgGlPropertyInterface.cpp
diff --git a/src/lib/gl_engine/tvgGlPropertyInterface.h b/src/renderer/gl_engine/tvgGlPropertyInterface.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlPropertyInterface.h
rename to src/renderer/gl_engine/tvgGlPropertyInterface.h
diff --git a/src/lib/gl_engine/tvgGlRenderTask.cpp b/src/renderer/gl_engine/tvgGlRenderTask.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlRenderTask.cpp
rename to src/renderer/gl_engine/tvgGlRenderTask.cpp
diff --git a/src/lib/gl_engine/tvgGlRenderTask.h b/src/renderer/gl_engine/tvgGlRenderTask.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlRenderTask.h
rename to src/renderer/gl_engine/tvgGlRenderTask.h
diff --git a/src/lib/gl_engine/tvgGlRenderer.cpp b/src/renderer/gl_engine/tvgGlRenderer.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlRenderer.cpp
rename to src/renderer/gl_engine/tvgGlRenderer.cpp
diff --git a/src/lib/gl_engine/tvgGlRenderer.h b/src/renderer/gl_engine/tvgGlRenderer.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlRenderer.h
rename to src/renderer/gl_engine/tvgGlRenderer.h
diff --git a/src/lib/gl_engine/tvgGlRendererProperties.h b/src/renderer/gl_engine/tvgGlRendererProperties.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlRendererProperties.h
rename to src/renderer/gl_engine/tvgGlRendererProperties.h
diff --git a/src/lib/gl_engine/tvgGlShader.cpp b/src/renderer/gl_engine/tvgGlShader.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlShader.cpp
rename to src/renderer/gl_engine/tvgGlShader.cpp
diff --git a/src/lib/gl_engine/tvgGlShader.h b/src/renderer/gl_engine/tvgGlShader.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlShader.h
rename to src/renderer/gl_engine/tvgGlShader.h
diff --git a/src/lib/gl_engine/tvgGlShaderSrc.cpp b/src/renderer/gl_engine/tvgGlShaderSrc.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlShaderSrc.cpp
rename to src/renderer/gl_engine/tvgGlShaderSrc.cpp
diff --git a/src/lib/gl_engine/tvgGlShaderSrc.h b/src/renderer/gl_engine/tvgGlShaderSrc.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlShaderSrc.h
rename to src/renderer/gl_engine/tvgGlShaderSrc.h
diff --git a/src/lib/gl_engine/tvgGlTessellator.cpp b/src/renderer/gl_engine/tvgGlTessellator.cpp
similarity index 100%
rename from src/lib/gl_engine/tvgGlTessellator.cpp
rename to src/renderer/gl_engine/tvgGlTessellator.cpp
diff --git a/src/lib/gl_engine/tvgGlTessellator.h b/src/renderer/gl_engine/tvgGlTessellator.h
similarity index 100%
rename from src/lib/gl_engine/tvgGlTessellator.h
rename to src/renderer/gl_engine/tvgGlTessellator.h
diff --git a/src/lib/meson.build b/src/renderer/meson.build
similarity index 100%
rename from src/lib/meson.build
rename to src/renderer/meson.build
diff --git a/src/lib/sw_engine/meson.build b/src/renderer/sw_engine/meson.build
similarity index 100%
rename from src/lib/sw_engine/meson.build
rename to src/renderer/sw_engine/meson.build
diff --git a/src/lib/sw_engine/tvgSwCommon.h b/src/renderer/sw_engine/tvgSwCommon.h
similarity index 100%
rename from src/lib/sw_engine/tvgSwCommon.h
rename to src/renderer/sw_engine/tvgSwCommon.h
diff --git a/src/lib/sw_engine/tvgSwFill.cpp b/src/renderer/sw_engine/tvgSwFill.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwFill.cpp
rename to src/renderer/sw_engine/tvgSwFill.cpp
diff --git a/src/lib/sw_engine/tvgSwImage.cpp b/src/renderer/sw_engine/tvgSwImage.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwImage.cpp
rename to src/renderer/sw_engine/tvgSwImage.cpp
diff --git a/src/lib/sw_engine/tvgSwMath.cpp b/src/renderer/sw_engine/tvgSwMath.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwMath.cpp
rename to src/renderer/sw_engine/tvgSwMath.cpp
diff --git a/src/lib/sw_engine/tvgSwMemPool.cpp b/src/renderer/sw_engine/tvgSwMemPool.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwMemPool.cpp
rename to src/renderer/sw_engine/tvgSwMemPool.cpp
diff --git a/src/lib/sw_engine/tvgSwRaster.cpp b/src/renderer/sw_engine/tvgSwRaster.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwRaster.cpp
rename to src/renderer/sw_engine/tvgSwRaster.cpp
diff --git a/src/lib/sw_engine/tvgSwRasterAvx.h b/src/renderer/sw_engine/tvgSwRasterAvx.h
similarity index 100%
rename from src/lib/sw_engine/tvgSwRasterAvx.h
rename to src/renderer/sw_engine/tvgSwRasterAvx.h
diff --git a/src/lib/sw_engine/tvgSwRasterC.h b/src/renderer/sw_engine/tvgSwRasterC.h
similarity index 100%
rename from src/lib/sw_engine/tvgSwRasterC.h
rename to src/renderer/sw_engine/tvgSwRasterC.h
diff --git a/src/lib/sw_engine/tvgSwRasterNeon.h b/src/renderer/sw_engine/tvgSwRasterNeon.h
similarity index 100%
rename from src/lib/sw_engine/tvgSwRasterNeon.h
rename to src/renderer/sw_engine/tvgSwRasterNeon.h
diff --git a/src/lib/sw_engine/tvgSwRasterTexmap.h b/src/renderer/sw_engine/tvgSwRasterTexmap.h
similarity index 100%
rename from src/lib/sw_engine/tvgSwRasterTexmap.h
rename to src/renderer/sw_engine/tvgSwRasterTexmap.h
diff --git a/src/lib/sw_engine/tvgSwRenderer.cpp b/src/renderer/sw_engine/tvgSwRenderer.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwRenderer.cpp
rename to src/renderer/sw_engine/tvgSwRenderer.cpp
diff --git a/src/lib/sw_engine/tvgSwRenderer.h b/src/renderer/sw_engine/tvgSwRenderer.h
similarity index 100%
rename from src/lib/sw_engine/tvgSwRenderer.h
rename to src/renderer/sw_engine/tvgSwRenderer.h
diff --git a/src/lib/sw_engine/tvgSwRle.cpp b/src/renderer/sw_engine/tvgSwRle.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwRle.cpp
rename to src/renderer/sw_engine/tvgSwRle.cpp
diff --git a/src/lib/sw_engine/tvgSwShape.cpp b/src/renderer/sw_engine/tvgSwShape.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwShape.cpp
rename to src/renderer/sw_engine/tvgSwShape.cpp
diff --git a/src/lib/sw_engine/tvgSwStroke.cpp b/src/renderer/sw_engine/tvgSwStroke.cpp
similarity index 100%
rename from src/lib/sw_engine/tvgSwStroke.cpp
rename to src/renderer/sw_engine/tvgSwStroke.cpp
diff --git a/src/lib/tvgAccessor.cpp b/src/renderer/tvgAccessor.cpp
similarity index 100%
rename from src/lib/tvgAccessor.cpp
rename to src/renderer/tvgAccessor.cpp
diff --git a/src/lib/tvgAnimation.cpp b/src/renderer/tvgAnimation.cpp
similarity index 100%
rename from src/lib/tvgAnimation.cpp
rename to src/renderer/tvgAnimation.cpp
diff --git a/src/lib/tvgBinaryDesc.h b/src/renderer/tvgBinaryDesc.h
similarity index 100%
rename from src/lib/tvgBinaryDesc.h
rename to src/renderer/tvgBinaryDesc.h
diff --git a/src/lib/tvgCanvas.cpp b/src/renderer/tvgCanvas.cpp
similarity index 100%
rename from src/lib/tvgCanvas.cpp
rename to src/renderer/tvgCanvas.cpp
diff --git a/src/lib/tvgCanvasImpl.h b/src/renderer/tvgCanvasImpl.h
similarity index 100%
rename from src/lib/tvgCanvasImpl.h
rename to src/renderer/tvgCanvasImpl.h
diff --git a/src/lib/tvgCommon.h b/src/renderer/tvgCommon.h
similarity index 100%
rename from src/lib/tvgCommon.h
rename to src/renderer/tvgCommon.h
diff --git a/src/lib/tvgFill.cpp b/src/renderer/tvgFill.cpp
similarity index 100%
rename from src/lib/tvgFill.cpp
rename to src/renderer/tvgFill.cpp
diff --git a/src/lib/tvgFill.h b/src/renderer/tvgFill.h
similarity index 100%
rename from src/lib/tvgFill.h
rename to src/renderer/tvgFill.h
diff --git a/src/lib/tvgFrameModule.h b/src/renderer/tvgFrameModule.h
similarity index 100%
rename from src/lib/tvgFrameModule.h
rename to src/renderer/tvgFrameModule.h
diff --git a/src/lib/tvgGlCanvas.cpp b/src/renderer/tvgGlCanvas.cpp
similarity index 100%
rename from src/lib/tvgGlCanvas.cpp
rename to src/renderer/tvgGlCanvas.cpp
diff --git a/src/lib/tvgInitializer.cpp b/src/renderer/tvgInitializer.cpp
similarity index 100%
rename from src/lib/tvgInitializer.cpp
rename to src/renderer/tvgInitializer.cpp
diff --git a/src/lib/tvgIteratorAccessor.h b/src/renderer/tvgIteratorAccessor.h
similarity index 100%
rename from src/lib/tvgIteratorAccessor.h
rename to src/renderer/tvgIteratorAccessor.h
diff --git a/src/lib/tvgLinearGradient.cpp b/src/renderer/tvgLinearGradient.cpp
similarity index 100%
rename from src/lib/tvgLinearGradient.cpp
rename to src/renderer/tvgLinearGradient.cpp
diff --git a/src/lib/tvgLoadModule.h b/src/renderer/tvgLoadModule.h
similarity index 100%
rename from src/lib/tvgLoadModule.h
rename to src/renderer/tvgLoadModule.h
diff --git a/src/lib/tvgLoader.cpp b/src/renderer/tvgLoader.cpp
similarity index 100%
rename from src/lib/tvgLoader.cpp
rename to src/renderer/tvgLoader.cpp
diff --git a/src/lib/tvgLoader.h b/src/renderer/tvgLoader.h
similarity index 100%
rename from src/lib/tvgLoader.h
rename to src/renderer/tvgLoader.h
diff --git a/src/lib/tvgPaint.cpp b/src/renderer/tvgPaint.cpp
similarity index 100%
rename from src/lib/tvgPaint.cpp
rename to src/renderer/tvgPaint.cpp
diff --git a/src/lib/tvgPaint.h b/src/renderer/tvgPaint.h
similarity index 100%
rename from src/lib/tvgPaint.h
rename to src/renderer/tvgPaint.h
diff --git a/src/lib/tvgPicture.cpp b/src/renderer/tvgPicture.cpp
similarity index 100%
rename from src/lib/tvgPicture.cpp
rename to src/renderer/tvgPicture.cpp
diff --git a/src/lib/tvgPictureImpl.h b/src/renderer/tvgPictureImpl.h
similarity index 100%
rename from src/lib/tvgPictureImpl.h
rename to src/renderer/tvgPictureImpl.h
diff --git a/src/lib/tvgRadialGradient.cpp b/src/renderer/tvgRadialGradient.cpp
similarity index 100%
rename from src/lib/tvgRadialGradient.cpp
rename to src/renderer/tvgRadialGradient.cpp
diff --git a/src/lib/tvgRender.cpp b/src/renderer/tvgRender.cpp
similarity index 100%
rename from src/lib/tvgRender.cpp
rename to src/renderer/tvgRender.cpp
diff --git a/src/lib/tvgRender.h b/src/renderer/tvgRender.h
similarity index 100%
rename from src/lib/tvgRender.h
rename to src/renderer/tvgRender.h
diff --git a/src/lib/tvgSaveModule.h b/src/renderer/tvgSaveModule.h
similarity index 100%
rename from src/lib/tvgSaveModule.h
rename to src/renderer/tvgSaveModule.h
diff --git a/src/lib/tvgSaver.cpp b/src/renderer/tvgSaver.cpp
similarity index 100%
rename from src/lib/tvgSaver.cpp
rename to src/renderer/tvgSaver.cpp
diff --git a/src/lib/tvgScene.cpp b/src/renderer/tvgScene.cpp
similarity index 100%
rename from src/lib/tvgScene.cpp
rename to src/renderer/tvgScene.cpp
diff --git a/src/lib/tvgSceneImpl.h b/src/renderer/tvgSceneImpl.h
similarity index 100%
rename from src/lib/tvgSceneImpl.h
rename to src/renderer/tvgSceneImpl.h
diff --git a/src/lib/tvgShape.cpp b/src/renderer/tvgShape.cpp
similarity index 100%
rename from src/lib/tvgShape.cpp
rename to src/renderer/tvgShape.cpp
diff --git a/src/lib/tvgShapeImpl.h b/src/renderer/tvgShapeImpl.h
similarity index 100%
rename from src/lib/tvgShapeImpl.h
rename to src/renderer/tvgShapeImpl.h
diff --git a/src/lib/tvgSwCanvas.cpp b/src/renderer/tvgSwCanvas.cpp
similarity index 100%
rename from src/lib/tvgSwCanvas.cpp
rename to src/renderer/tvgSwCanvas.cpp
diff --git a/src/lib/tvgTaskScheduler.cpp b/src/renderer/tvgTaskScheduler.cpp
similarity index 100%
rename from src/lib/tvgTaskScheduler.cpp
rename to src/renderer/tvgTaskScheduler.cpp
diff --git a/src/lib/tvgTaskScheduler.h b/src/renderer/tvgTaskScheduler.h
similarity index 100%
rename from src/lib/tvgTaskScheduler.h
rename to src/renderer/tvgTaskScheduler.h
diff --git a/src/bin/meson.build b/src/tools/meson.build
similarity index 100%
rename from src/bin/meson.build
rename to src/tools/meson.build
diff --git a/src/bin/svg2png/lodepng.cpp b/src/tools/svg2png/lodepng.cpp
similarity index 100%
rename from src/bin/svg2png/lodepng.cpp
rename to src/tools/svg2png/lodepng.cpp
diff --git a/src/bin/svg2png/lodepng.h b/src/tools/svg2png/lodepng.h
similarity index 100%
rename from src/bin/svg2png/lodepng.h
rename to src/tools/svg2png/lodepng.h
diff --git a/src/bin/svg2png/meson.build b/src/tools/svg2png/meson.build
similarity index 100%
rename from src/bin/svg2png/meson.build
rename to src/tools/svg2png/meson.build
diff --git a/src/bin/svg2png/svg2png.cpp b/src/tools/svg2png/svg2png.cpp
similarity index 100%
rename from src/bin/svg2png/svg2png.cpp
rename to src/tools/svg2png/svg2png.cpp
diff --git a/src/bin/svg2tvg/meson.build b/src/tools/svg2tvg/meson.build
similarity index 100%
rename from src/bin/svg2tvg/meson.build
rename to src/tools/svg2tvg/meson.build
diff --git a/src/bin/svg2tvg/svg2tvg.cpp b/src/tools/svg2tvg/svg2tvg.cpp
similarity index 100%
rename from src/bin/svg2tvg/svg2tvg.cpp
rename to src/tools/svg2tvg/svg2tvg.cpp