diff --git a/CMakeLists.txt b/CMakeLists.txt
index b48142f..e866adc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ add_definitions(${GLIB2_CFLAGS_OTHER})
 
 aux_source_directory("widgets" LAYER_SOURCES)
 aux_source_directory("tree-renderer" RENDERER_SOURCES)
-aux_source_directory("gds-parser" PARSER_SOURCES)
+aux_source_directory("gds-utils" GDS_SOURCES)
 aux_source_directory("latex-output" LATEX_SOURCES)
 aux_source_directory("cairo-output" CAIRO_SOURCES)
 aux_source_directory("trigonometric" TRIG_SOURCES)
@@ -27,7 +27,7 @@ set(SOURCE
   ${SOURCE}
   ${LAYER_SOURCES}
   ${RENDERER_SOURCES}
-  ${PARSER_SOURCES}
+  ${GDS_SOURCES}
   ${LATEX_SOURCES}
   ${CAIRO_SOURCES}
   ${TRIG_SOURCES}
diff --git a/cairo-output/cairo-output.h b/cairo-output/cairo-output.h
index 3afccbe..32038ee 100644
--- a/cairo-output/cairo-output.h
+++ b/cairo-output/cairo-output.h
@@ -25,7 +25,7 @@
 #define __CAIRO_OUTPUT_H__
 
 #include "../layer/layer-info.h"
-#include "../gds-parser/gds-types.h"
+#include "../gds-utils/gds-types.h"
 
 /** @addtogroup Cairo-Renderer
  *  @{
diff --git a/command-line.c b/command-line.c
index ee7e8ec..af95917 100644
--- a/command-line.c
+++ b/command-line.c
@@ -30,13 +30,13 @@
 
 #include <stdio.h>
 #include "command-line.h"
-#include "gds-parser/gds-parser.h"
+#include "gds-utils/gds-parser.h"
 #include "mapping-parser.h"
 #include "layer/layer-info.h"
 #include "cairo-output/cairo-output.h"
 #include "latex-output/latex-output.h"
 #include "external-renderer.h"
-#include "gds-parser/gds-tree-checker.h"
+#include "gds-utils/gds-tree-checker.h"
 
 /**
  * @brief Delete layer_info and free nem element.
diff --git a/external-renderer.h b/external-renderer.h
index 841b219..63f5077 100644
--- a/external-renderer.h
+++ b/external-renderer.h
@@ -31,7 +31,7 @@
 #ifndef _EXTERNAL_RENDERER_H_
 #define _EXTERNAL_RENDERER_H_
 
-#include "gds-parser/gds-types.h"
+#include "gds-utils/gds-types.h"
 #include <glib.h>
 
 /**
diff --git a/gds-render-gui.c b/gds-render-gui.c
index 55a0a32..f4ab8a1 100644
--- a/gds-render-gui.c
+++ b/gds-render-gui.c
@@ -29,7 +29,7 @@
 
 #include "gds-render-gui.h"
 #include <stdio.h>
-#include "gds-parser/gds-parser.h"
+#include "gds-utils/gds-parser.h"
 #include <gtk/gtk.h>
 #include "layer/layer-selector.h"
 #include "tree-renderer/tree-store.h"
@@ -39,7 +39,7 @@
 #include "trigonometric/cell-trigonometrics.h"
 #include "version/version.h"
 #include "tree-renderer/lib-cell-renderer.h"
-#include "gds-parser/gds-tree-checker.h"
+#include "gds-utils/gds-tree-checker.h"
 
 enum gds_render_gui_signal_sig_ids {SIGNAL_WINDOW_CLOSED = 0, SIGNAL_COUNT};
 
diff --git a/gds-parser/gds-parser.c b/gds-utils/gds-parser.c
similarity index 100%
rename from gds-parser/gds-parser.c
rename to gds-utils/gds-parser.c
diff --git a/gds-parser/gds-parser.h b/gds-utils/gds-parser.h
similarity index 100%
rename from gds-parser/gds-parser.h
rename to gds-utils/gds-parser.h
diff --git a/gds-parser/gds-tree-checker.c b/gds-utils/gds-tree-checker.c
similarity index 100%
rename from gds-parser/gds-tree-checker.c
rename to gds-utils/gds-tree-checker.c
diff --git a/gds-parser/gds-tree-checker.h b/gds-utils/gds-tree-checker.h
similarity index 100%
rename from gds-parser/gds-tree-checker.h
rename to gds-utils/gds-tree-checker.h
diff --git a/gds-parser/gds-types.h b/gds-utils/gds-types.h
similarity index 100%
rename from gds-parser/gds-types.h
rename to gds-utils/gds-types.h
diff --git a/latex-output/latex-output.h b/latex-output/latex-output.h
index 2329171..f20c543 100644
--- a/latex-output/latex-output.h
+++ b/latex-output/latex-output.h
@@ -31,7 +31,7 @@
  * @{
  */
 
-#include "../gds-parser/gds-types.h"
+#include "../gds-utils/gds-types.h"
 #include <glib.h>
 #include <stdio.h>
 #include "../layer/layer-info.h"
diff --git a/layer/layer-selector.c b/layer/layer-selector.c
index 772aa39..48f4f0c 100644
--- a/layer/layer-selector.c
+++ b/layer/layer-selector.c
@@ -30,7 +30,7 @@
 
 #include "layer-selector.h"
 #include "layer-info.h"
-#include "../gds-parser/gds-parser.h"
+#include "../gds-utils/gds-parser.h"
 #include "../widgets/layer-element.h"
 #include "../mapping-parser.h"
 #include <glib.h>
diff --git a/tree-renderer/lib-cell-renderer.c b/tree-renderer/lib-cell-renderer.c
index 99e96e5..6af5512 100644
--- a/tree-renderer/lib-cell-renderer.c
+++ b/tree-renderer/lib-cell-renderer.c
@@ -18,7 +18,7 @@
  */
 
 #include "lib-cell-renderer.h"
-#include "../gds-parser/gds-types.h"
+#include "../gds-utils/gds-types.h"
 
 G_DEFINE_TYPE(LibCellRenderer, lib_cell_renderer, GTK_TYPE_CELL_RENDERER_TEXT)
 
diff --git a/tree-renderer/tree-store.c b/tree-renderer/tree-store.c
index 3da3d63..9ab9411 100644
--- a/tree-renderer/tree-store.c
+++ b/tree-renderer/tree-store.c
@@ -30,7 +30,7 @@
 
 #include "tree-store.h"
 #include "lib-cell-renderer.h"
-#include "../gds-parser/gds-types.h"
+#include "../gds-utils/gds-types.h"
 
 /**
  * @brief this function olny allows cells to be selected
diff --git a/trigonometric/cell-trigonometrics.h b/trigonometric/cell-trigonometrics.h
index 2a4ba5d..6136bb2 100644
--- a/trigonometric/cell-trigonometrics.h
+++ b/trigonometric/cell-trigonometrics.h
@@ -32,7 +32,7 @@
 #define _CELL_TRIGONOMETRICS_H_
 
 #include "bounding-box.h"
-#include "../gds-parser/gds-types.h"
+#include "../gds-utils/gds-types.h"
 
 /**
  * @brief calculate_cell_bounding_box Calculate bounding box of gds cell