diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9771101d89dd4623f4a1c72956880e6097bd498e..612bb756c7ee6a8e32322d4d6e3e628e8069a01d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,11 +8,10 @@ project(adt2amas_exec C CXX)
 add_subdirectory(linear_expression)
 add_subdirectory(adtree)
 add_subdirectory(amas)
-add_subdirectory(parsers)
 
 # translator library
 add_library(adt2amas_lib translator.cpp)
-target_link_libraries(adt2amas_lib adtree_lib amas_lib linear_expr_lib parser_lib)
+target_link_libraries(adt2amas_lib adtree_lib amas_lib linear_expr_lib )
 target_include_directories(adt2amas_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # The main programn
diff --git a/src/amas/CMakeLists.txt b/src/amas/CMakeLists.txt
index 562c9174c74ac0fe4906b0cb67887dfd1467ba9a..77b5c438575c636569c5f85175a340e4e8df4e0d 100644
--- a/src/amas/CMakeLists.txt
+++ b/src/amas/CMakeLists.txt
@@ -1,6 +1,13 @@
 # Specify the minimum version for CMake
 cmake_minimum_required(VERSION 3.0.0)
 
+# Linear Expression Library
+set(PARSER_FILES
+  ${CMAKE_CURRENT_LIST_DIR}/parser/amas_visitor.hpp
+  ${CMAKE_CURRENT_LIST_DIR}/parser/tikz_visitor.cpp)
+
+
+
 # Asynchronous Multi-Agent System Library
 add_library(
   amas_lib
@@ -14,9 +21,10 @@ add_library(
   state.cpp
   state_type.cpp
   automata.cpp
-  automaton.cpp)
+  automaton.cpp
+  ${PARSER_FILES})
 
 
-target_link_libraries(amas_lib linear_expr_lib parser_lib)
+target_link_libraries(amas_lib linear_expr_lib)
 
 target_include_directories(amas_lib PUBLIC ${CMAKE_CURRENT_LIST_DIR})
diff --git a/src/amas/automata.hpp b/src/amas/automata.hpp
index ed1629e5d18595bba92e2595115edfec08b1d930..68e04703b2b158b3e052ccb80d4f17d6e7449a00 100644
--- a/src/amas/automata.hpp
+++ b/src/amas/automata.hpp
@@ -1,9 +1,9 @@
 #ifndef AUTOMATA_HPP
 #define AUTOMATA_HPP
 
-#include "amas_visitor.hpp"
 #include "automaton.hpp"
 #include "channel.hpp"
+#include "parser/amas_visitor.hpp"
 
 class Automaton;
 class AMASVisitor;
diff --git a/src/amas/automaton.hpp b/src/amas/automaton.hpp
index 7aeb07d90886c2e8e1578abd6b738e27bcd3d8a9..c515352bd325c6585c934afd3d96fde334dcfebf 100644
--- a/src/amas/automaton.hpp
+++ b/src/amas/automaton.hpp
@@ -4,7 +4,7 @@
 #include <set>
 #include <vector>
 #include "action.hpp"
-#include "amas_visitor.hpp"
+#include "parser/amas_visitor.hpp"
 #include "state.hpp"
 #include "transition.hpp"
 #include "update.hpp"
diff --git a/src/amas/label.hpp b/src/amas/label.hpp
index 2ced6e76e17a3712347d9bdaba2fb46dbea331d0..c80589acdc7f576479cf4431f523fcebe8eeb64c 100644
--- a/src/amas/label.hpp
+++ b/src/amas/label.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include "action.hpp"
-#include "amas_visitor.hpp"
+#include "parser/amas_visitor.hpp"
 
 class AMASVisitor;
 
diff --git a/src/parsers/amas_visitor.hpp b/src/amas/parser/amas_visitor.hpp
similarity index 100%
rename from src/parsers/amas_visitor.hpp
rename to src/amas/parser/amas_visitor.hpp
diff --git a/src/parsers/tikz_visitor.cpp b/src/amas/parser/tikz_visitor.cpp
similarity index 100%
rename from src/parsers/tikz_visitor.cpp
rename to src/amas/parser/tikz_visitor.cpp
diff --git a/src/parsers/tikz_visitor.hpp b/src/amas/parser/tikz_visitor.hpp
similarity index 100%
rename from src/parsers/tikz_visitor.hpp
rename to src/amas/parser/tikz_visitor.hpp
diff --git a/src/amas/state.hpp b/src/amas/state.hpp
index acd7c7eef9e35282831a88d9b862772939387908..a68a0079780d962ce6042a791499f097f5f16cc3 100644
--- a/src/amas/state.hpp
+++ b/src/amas/state.hpp
@@ -2,7 +2,7 @@
 #define STATE_HPP
 
 #include <string>
-#include "amas_visitor.hpp"
+#include "parser/amas_visitor.hpp"
 #include "state_type.hpp"
 #include "transition.hpp"
 
diff --git a/src/amas/synchronization.hpp b/src/amas/synchronization.hpp
index 8e91ef241322cad7623aebeab4304d3882f5d2e4..2845bf099b1deb48ad78581568af88f2e9cc0ebb 100644
--- a/src/amas/synchronization.hpp
+++ b/src/amas/synchronization.hpp
@@ -2,8 +2,8 @@
 #define SYNCHRONIZATION_HPP
 
 #include "action.hpp"
-#include "amas_visitor.hpp"
 #include "channel.hpp"
+#include "parser/amas_visitor.hpp"
 #include "synchronization_type.hpp"
 
 class AMASVisitor;
diff --git a/src/amas/transition.hpp b/src/amas/transition.hpp
index 1035575617047d58589e8215eb97694556604c54..5a51643928c19a773a58eeb3fa89932de34546b7 100644
--- a/src/amas/transition.hpp
+++ b/src/amas/transition.hpp
@@ -2,8 +2,8 @@
 #define TRANSITION_HPP
 
 #include <bits/stdc++.h>
-#include "amas_visitor.hpp"
 #include "label.hpp"
+#include "parser/amas_visitor.hpp"
 #include "state.hpp"
 #include "synchronization.hpp"
 #include "update.hpp"
diff --git a/src/amas/update.hpp b/src/amas/update.hpp
index e5d3029a4c83800b6ddea42cc36bda006c6142cc..a66d5ab8f172c1f79bab76d5e34166330dd11d55 100644
--- a/src/amas/update.hpp
+++ b/src/amas/update.hpp
@@ -2,8 +2,8 @@
 #define UPDATE_HPP
 
 #include <string>
-#include "amas_visitor.hpp"
 #include "linear_expression.hpp"
+#include "parser/amas_visitor.hpp"
 
 class AMASVisitor;
 
diff --git a/src/parsers/CMakeLists.txt b/src/parsers/CMakeLists.txt
deleted file mode 100644
index 0c1cd6eff294972896c876a7fcb9c40c0c050781..0000000000000000000000000000000000000000
--- a/src/parsers/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Specify the minimum version for CMake
-cmake_minimum_required(VERSION 3.0.0)
-
-add_library(parser_lib
-  amas_visitor.hpp
-  tikz_visitor.cpp)
-
-
-target_link_libraries(parser_lib amas_lib)
-target_include_directories(parser_lib PUBLIC ${CMAKE_CURRENT_LIST_DIR})
diff --git a/tests/case_studies/treasure_hunters.cpp b/tests/case_studies/treasure_hunters.cpp
index 08877f5fffc530c900e5b8d0ff54fa5d4fb2f439..f716166590866e8597fad9225a38013293fd741e 100644
--- a/tests/case_studies/treasure_hunters.cpp
+++ b/tests/case_studies/treasure_hunters.cpp
@@ -2,8 +2,8 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+#include "amas/parser/tikz_visitor.hpp"
 #include "factory.cpp"
-#include "parsers/tikz_visitor.hpp"
 #include "translator.hpp"
 
 using namespace std;