diff --git a/smocore/include/cologex.h b/include/user/cologex.h
similarity index 98%
rename from smocore/include/cologex.h
rename to include/user/cologex.h
index f81bd5a..c9e61d0 100644
--- a/smocore/include/cologex.h
+++ b/include/user/cologex.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include <memory>
-#include <logic.h>
+#include <user/logic.h>
 #include <mentalEntity.h>
 #include <concept.h>
 #include <user/stimFrame.h>
diff --git a/smocore/include/logic.h b/smocore/include/logic.h
deleted file mode 100644
index 6e08225..0000000
--- a/smocore/include/logic.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef _LOGIC_H
-#define _LOGIC_H
-
-#include <memory>
-#include <vector>
-
-namespace smo {
-namespace logic {
-
-class ExpressionPart
-{
-};
-
-class Operator
-:	public ExpressionPart
-{
-};
-
-class OperatorAnd
-: public Operator
-{
-};
-
-class OperatorOr
-: public Operator
-{
-};
-
-class OperatorNot
-: public Operator
-{
-};
-
-class Operand
-:	public ExpressionPart
-{
-};
-
-class UnaryExpression
-:	public ExpressionPart
-{
-public:
-	UnaryExpression(Operator &op, const std::shared_ptr<Operand> &operand)
-	:	parts(std::make_pair(op, operand))
-	{}
-public:
-	std::pair<Operator, std::shared_ptr<Operand>> parts;
-};
-
-// Expressions can be chained as parts of a larger expression
-class Expression
-:	public ExpressionPart
-{
-public:
-	// This will eventually take in some data to be evaluated for a match.
-	virtual bool evaluate(void) = 0;
-
-public:
-	std::vector<std::shared_ptr<ExpressionPart>> parts;
-};
-
-} // namespace logic
-} // namespace smo
-
-#endif