diff --git a/libwccl/CMakeLists.txt b/libwccl/CMakeLists.txt
index 5f1f429f2aca36b293f2a2820f17846b3f3c570d..32684ce07ed29b82d2fbd5bc7283de733d306507 100644
--- a/libwccl/CMakeLists.txt
+++ b/libwccl/CMakeLists.txt
@@ -27,10 +27,6 @@ endif(WIN32)
 
 SET(libwccl_STAT_SRC
 	exception.cpp
-	ops/actions/delete.cpp
-	ops/actions/relabel.cpp
-	ops/actions/select.cpp
-	ops/actions/unify.cpp
 	ops/formatters.cpp
 	ops/functions/bool/iteration.cpp
 	ops/functions/bool/iterations/atleast.cpp
@@ -60,6 +56,10 @@ SET(libwccl_STAT_SRC
 	ops/functions/tset/getsymbolsinrange.cpp
 	ops/rulesequence.cpp
 	ops/tagaction.cpp
+	ops/tagactions/delete.cpp
+	ops/tagactions/relabel.cpp
+	ops/tagactions/select.cpp
+	ops/tagactions/unify.cpp
 	ops/tagrule.cpp
 	parser/grammar.g
 	parser/Parser.cpp
diff --git a/libwccl/ops/tagactions/delete.cpp b/libwccl/ops/tagactions/delete.cpp
index df2cd223b04110141e1f0d0c5f0fbefd065bb845..05cb5b6be1a47807a739a3abcfc3a0fcf30bcfa8 100644
--- a/libwccl/ops/tagactions/delete.cpp
+++ b/libwccl/ops/tagactions/delete.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/actions/delete.h>
+#include <libwccl/ops/tagactions/delete.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 
diff --git a/libwccl/ops/tagactions/delete.h b/libwccl/ops/tagactions/delete.h
index 83fe105772dcadfb06ff37915ad5d0886df3b253..53c8e857ab86348e0b63c1ab8a8dd694a608c575 100644
--- a/libwccl/ops/tagactions/delete.h
+++ b/libwccl/ops/tagactions/delete.h
@@ -1,5 +1,5 @@
-#ifndef LIBWCCL_OPS_ACTIONS_DELETE_H
-#define LIBWCCL_OPS_ACTIONS_DELETE_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_DELETE_H
+#define LIBWCCL_OPS_TAGACTIONS_DELETE_H
 
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/values/position.h>
@@ -66,4 +66,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // LIBWCCL_OPS_ACTIONS_DELETE_H
+#endif // LIBWCCL_OPS_TAGACTIONS_DELETE_H
diff --git a/libwccl/ops/tagactions/relabel.cpp b/libwccl/ops/tagactions/relabel.cpp
index e741515f41224a6f7be13f4a235e89aed3d5a8c7..aa2643973ae20fe9e7735a65d74ead8e50f48053 100644
--- a/libwccl/ops/tagactions/relabel.cpp
+++ b/libwccl/ops/tagactions/relabel.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/actions/relabel.h>
+#include <libwccl/ops/tagactions/relabel.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 
diff --git a/libwccl/ops/tagactions/relabel.h b/libwccl/ops/tagactions/relabel.h
index 1fa5a8c55b57dabf734c99e828c298731dabfb35..18d78f6b728229d118fe9ae43539bddf99e45c10 100644
--- a/libwccl/ops/tagactions/relabel.h
+++ b/libwccl/ops/tagactions/relabel.h
@@ -1,5 +1,5 @@
-#ifndef LIBWCCL_OPS_ACTIONS_RELABEL_H
-#define LIBWCCL_OPS_ACTIONS_RELABEL_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_RELABEL_H
+#define LIBWCCL_OPS_TAGACTIONS_RELABEL_H
 
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/values/position.h>
@@ -69,4 +69,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // LIBWCCL_OPS_ACTIONS_RELABEL_H
+#endif // LIBWCCL_OPS_TAGACTIONS_RELABEL_H
diff --git a/libwccl/ops/tagactions/select.cpp b/libwccl/ops/tagactions/select.cpp
index cd746b21362737bd3ff8162e2b5cfaea1f899e40..3205800c2e006a4103bf2edecec99187757d2d66 100644
--- a/libwccl/ops/tagactions/select.cpp
+++ b/libwccl/ops/tagactions/select.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/actions/select.h>
+#include <libwccl/ops/tagactions/select.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 
diff --git a/libwccl/ops/tagactions/select.h b/libwccl/ops/tagactions/select.h
index 12a8431f91b160c823137e54ac2f489b4df5ee94..b3fd95a10af58f20b42ef4f48aa377df76eabd66 100644
--- a/libwccl/ops/tagactions/select.h
+++ b/libwccl/ops/tagactions/select.h
@@ -1,5 +1,5 @@
-#ifndef LIBWCCL_OPS_ACTIONS_SELECT_H
-#define LIBWCCL_OPS_ACTIONS_SELECT_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_SELECT_H
+#define LIBWCCL_OPS_TAGACTIONS_SELECT_H
 
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/values/position.h>
@@ -66,4 +66,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // LIBWCCL_OPS_ACTIONS_SELECT_H
+#endif // LIBWCCL_OPS_TAGACTIONS_SELECT_H
diff --git a/libwccl/ops/tagactions/unify.cpp b/libwccl/ops/tagactions/unify.cpp
index 0cf51523b57798165bbf0fca69303c3b103ab651..2c1e548a035dc4c5cd060e18abd64e9b2edae492 100644
--- a/libwccl/ops/tagactions/unify.cpp
+++ b/libwccl/ops/tagactions/unify.cpp
@@ -1,4 +1,4 @@
-#include <libwccl/ops/actions/unify.h>
+#include <libwccl/ops/tagactions/unify.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 
diff --git a/libwccl/ops/tagactions/unify.h b/libwccl/ops/tagactions/unify.h
index 29f3849f4a0fd3500fb257ba1a49b69b24dec83e..e0e1527f7f42dd1118e657734d32bf2fe6378816 100644
--- a/libwccl/ops/tagactions/unify.h
+++ b/libwccl/ops/tagactions/unify.h
@@ -1,5 +1,5 @@
-#ifndef LIBWCCL_OPS_ACTIONS_UNIFY_H
-#define LIBWCCL_OPS_ACTIONS_UNIFY_H
+#ifndef LIBWCCL_OPS_TAGACTIONS_UNIFY_H
+#define LIBWCCL_OPS_TAGACTIONS_UNIFY_H
 
 #include <libwccl/ops/tagaction.h>
 #include <libwccl/values/position.h>
@@ -69,4 +69,4 @@ private:
 
 } /* end ns Wccl */
 
-#endif // LIBWCCL_OPS_ACTIONS_UNIFY_H
+#endif // LIBWCCL_OPS_TAGACTIONS_UNIFY_H
diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index ce46e9ee4998e7e2d5b5a65610414857992abd74..b8d0aa44005a0673aa0be093c00a862aa00227df 100644
--- a/libwccl/parser/grammar.g
+++ b/libwccl/parser/grammar.g
@@ -62,10 +62,10 @@ header {
 	#include <libwccl/ops/tagrule.h>
 	#include <libwccl/ops/rulesequence.h>
 	//
-	#include <libwccl/ops/actions/unify.h>
-	#include <libwccl/ops/actions/delete.h>
-	#include <libwccl/ops/actions/select.h>
-	#include <libwccl/ops/actions/relabel.h>
+	#include <libwccl/ops/tagactions/unify.h>
+	#include <libwccl/ops/tagactions/delete.h>
+	#include <libwccl/ops/tagactions/select.h>
+	#include <libwccl/ops/tagactions/relabel.h>
 
 
 	// Unicode String