14 files changed, 42 insertions, 43 deletions
diff --git a/project2/common/scripts.cpp b/project2/common/scripts.cpp
index 997f558..e2f1370 100644
--- a/project2/common/scripts.cpp
+++ b/project2/common/scripts.cpp
@@ -1,5 +1,5 @@
 #include "scripts.h"
-#include "variables-modfixed.h"
+#include "variables/fixed.h"
 
 ScriptNode::ScriptNode(ScriptReaderPtr s) :
 	script(s)
diff --git a/project2/common/validDateCheck.cpp b/project2/common/tests/validDateCheck.cpp
index be983b4..dabbdaa 100644
--- a/project2/common/validDateCheck.cpp
+++ b/project2/common/tests/validDateCheck.cpp
@@ -1,10 +1,10 @@
 #include <pch.hpp>
-#include "logger.h"
-#include "scriptLoader.h"
-#include "commonObjects.h"
-#include "test.h"
-#include "variables.h"
-#include "scripts.h"
+#include "../logger.h"
+#include "../scriptLoader.h"
+#include "../commonObjects.h"
+#include "../test.h"
+#include "../variables.h"
+#include "../scripts.h"
 
 class ValidDateTest : public Test {
 	public:
diff --git a/project2/common/variables.cpp b/project2/common/variables.cpp
index 4b42aa3..7dcf243 100644
--- a/project2/common/variables.cpp
+++ b/project2/common/variables.cpp
@@ -1,7 +1,7 @@
 #include <pch.hpp>
 #include "logger.h"
 #include "variables.h"
-#include "variables-modfixed.h"
+#include "variables/fixed.h"
 #include "iHaveParameters.h"
 #include "scriptLoader.h"
 #include "exceptions.h"
diff --git a/project2/common/variables-modconfig.cpp b/project2/common/variables/config.cpp
index 4d9553a..67014c4 100644
--- a/project2/common/variables-modconfig.cpp
+++ b/project2/common/variables/config.cpp
@@ -1,9 +1,9 @@
 #include <pch.hpp>
-#include "variables.h"
-#include "scriptLoader.h"
-#include "scriptStorage.h"
+#include "../variables.h"
+#include "../scriptLoader.h"
+#include "../scriptStorage.h"
 #include <boost/algorithm/string/predicate.hpp>
-#include "appEngine.h"
+#include "../appEngine.h"
 
 typedef std::map<Glib::ustring, Glib::ustring> ConfigOptions;
 static ConfigOptions cfgOpts;
diff --git a/project2/common/variables-modfixed.cpp b/project2/common/variables/fixed.cpp
index 45fa74e..fdb67ed 100644
--- a/project2/common/variables-modfixed.cpp
+++ b/project2/common/variables/fixed.cpp
@@ -1,4 +1,4 @@
-#include "variables-modfixed.h"
+#include "fixed.h"
 
 VariableFixed::VariableFixed(VariableType v) :
 	var(v)
diff --git a/project2/common/variables-modfixed.h b/project2/common/variables/fixed.h
index eceb548..ec8be1a 100644
--- a/project2/common/variables-modfixed.h
+++ b/project2/common/variables/fixed.h
@@ -1,7 +1,7 @@
 #ifndef VARIABLES_MODFIXED_H
 #define VARIABLES_MODFIXED_H
 
-#include "variables.h"
+#include "../variables.h"
 
 /// Variable implementation which has some fixed value
 class VariableFixed : public VariableImpl {
diff --git a/project2/common/variables-modliteral.cpp b/project2/common/variables/literal.cpp
index 33c9ad5..11fb78a 100644
--- a/project2/common/variables-modliteral.cpp
+++ b/project2/common/variables/literal.cpp
@@ -1,6 +1,5 @@
-#include "variables-modliteral.h"
-#include "scripts.h"
-#include <stdio.h>
+#include "literal.h"
+#include "../scripts.h"
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 
@@ -76,3 +75,4 @@ DECLARE_COMPONENT_LOADER("literal", VariableLiteral, VariableLoader);
 DECLARE_CUSTOM_COMPONENT_LOADER("", VariableLiteralDef, VariableLoader::For<VariableLiteral>, VariableLoader);
 
 
+
diff --git a/project2/common/variables-modliteral.h b/project2/common/variables/literal.h
index 77a43cc..4128d1c 100644
--- a/project2/common/variables-modliteral.h
+++ b/project2/common/variables/literal.h
@@ -1,7 +1,7 @@
 #ifndef VARIABLES_MODLITERAL_H
 #define VARIABLES_MODLITERAL_H
 
-#include "variables.h"
+#include "../variables.h"
 #include <list>
 
 class VariableLiteral : public VariableImpl {
diff --git a/project2/common/variables-modlocalparam.cpp b/project2/common/variables/localparam.cpp
index 38cfbba..1b789a7 100644
--- a/project2/common/variables-modlocalparam.cpp
+++ b/project2/common/variables/localparam.cpp
@@ -1,9 +1,8 @@
 #include <pch.hpp>
-#include "variables.h"
-#include "scriptLoader.h"
-#include "logger.h"
-#include "scriptStorage.h"
-#include "iHaveParameters.h"
+#include "../variables.h"
+#include "../scriptLoader.h"
+#include "../scriptStorage.h"
+#include "../iHaveParameters.h"
 
 /// Variable implementation to access call parameters
 class VariableLocalParam : public VariableImplDyn {
diff --git a/project2/common/variables-modlookup.cpp b/project2/common/variables/lookup.cpp
index 64ff93d..892968e 100644
--- a/project2/common/variables-modlookup.cpp
+++ b/project2/common/variables/lookup.cpp
@@ -1,12 +1,12 @@
 #include <pch.hpp>
-#include "variables.h"
-#include "safeMapFind.h"
-#include "logger.h"
-#include "rowProcessor.h"
-#include "rowSet.h"
+#include "../variables.h"
+#include "../safeMapFind.h"
+#include "../logger.h"
+#include "../rowProcessor.h"
+#include "../rowSet.h"
 #include <boost/foreach.hpp>
-#include "scriptLoader.h"
-#include "scriptStorage.h"
+#include "../scriptLoader.h"
+#include "../scriptStorage.h"
 
 
 /// Variable implementation that looks up it's value in a map of key(s)/value pairs
diff --git a/project2/common/variables-modparam.cpp b/project2/common/variables/param.cpp
index 3019b96..7292b0a 100644
--- a/project2/common/variables-modparam.cpp
+++ b/project2/common/variables/param.cpp
@@ -1,8 +1,8 @@
 #include <pch.hpp>
-#include "variables.h"
-#include "scriptLoader.h"
-#include "scriptStorage.h"
-#include "appEngine.h"
+#include "../variables.h"
+#include "../scriptLoader.h"
+#include "../scriptStorage.h"
+#include "../appEngine.h"
 
 /// Variable implementation to access call parameters
 class VariableParam : public VariableImplDyn {
diff --git a/project2/common/variables-modsession.cpp b/project2/common/variables/session.cpp
index 551f448..fc33d8e 100644
--- a/project2/common/variables-modsession.cpp
+++ b/project2/common/variables/session.cpp
@@ -1,8 +1,8 @@
 #include <pch.hpp>
-#include "variables.h"
-#include "scriptLoader.h"
-#include "scriptStorage.h"
-#include "appEngine.h"
+#include "../variables.h"
+#include "../scriptLoader.h"
+#include "../scriptStorage.h"
+#include "../appEngine.h"
 
 /// Variable implementation to access session contents
 class VariableSession : public VariableImplDyn {
diff --git a/project2/common/variables-moduri.cpp b/project2/common/variables/uri.cpp
index 81b8698..c5e596f 100644
--- a/project2/common/variables-moduri.cpp
+++ b/project2/common/variables/uri.cpp
@@ -1,8 +1,8 @@
 #include <pch.hpp>
-#include "variables.h"
-#include "scriptLoader.h"
-#include "scriptStorage.h"
-#include "appEngine.h"
+#include "../variables.h"
+#include "../scriptLoader.h"
+#include "../scriptStorage.h"
+#include "../appEngine.h"
 
 /// Variable implementation to access URI path fragments
 class VariableUri : public VariableImplDyn {
diff --git a/project2/xml/xmlScriptParser.cpp b/project2/xml/xmlScriptParser.cpp
index 71c4bb5..abdffdd 100644
--- a/project2/xml/xmlScriptParser.cpp
+++ b/project2/xml/xmlScriptParser.cpp
@@ -2,7 +2,7 @@
 #include "xmlScriptParser.h"
 #include "scripts.h"
 #include "commonObjects.h"
-#include "variables-modliteral.h"
+#include "variables/literal.h"
 #include <boost/filesystem/convenience.hpp>
 
 static const std::string XIncludeNS("http://www.w3.org/2001/XInclude");