diff --git a/Middleware/README.md b/Middleware/README.md
deleted file mode 100644
index b698e47..0000000
--- a/Middleware/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# SmarDes Middleware Layer
-
-[Build Instructions](Build.md)
-
-[Installation](Install.md)
-
-[Configuration](Configuration.md)
diff --git a/Middleware/smardes-middleware/.gitattributes b/smardes-middleware/.gitattributes
similarity index 100%
rename from Middleware/smardes-middleware/.gitattributes
rename to smardes-middleware/.gitattributes
diff --git a/Middleware/smardes-middleware/.gitignore b/smardes-middleware/.gitignore
similarity index 100%
rename from Middleware/smardes-middleware/.gitignore
rename to smardes-middleware/.gitignore
diff --git a/Middleware/smardes-middleware/.project b/smardes-middleware/.project
similarity index 100%
rename from Middleware/smardes-middleware/.project
rename to smardes-middleware/.project
diff --git a/Middleware/smardes-middleware/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/.settings/org.eclipse.core.resources.prefs
diff --git a/smardes-middleware/README.md b/smardes-middleware/README.md
new file mode 100644
index 0000000..2a77654
--- /dev/null
+++ b/smardes-middleware/README.md
@@ -0,0 +1,7 @@
+# SmarDes Middleware Layer
+
+[Build Instructions](doc/Build.md)
+
+[Installation](doc/Install.md)
+
+[Configuration](doc/Configuration.md)
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/.classpath b/smardes-middleware/base/smardes-common-jpa/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/.classpath
rename to smardes-middleware/base/smardes-common-jpa/.classpath
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/.project b/smardes-middleware/base/smardes-common-jpa/.project
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/.project
rename to smardes-middleware/base/smardes-common-jpa/.project
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/base/smardes-common-jpa/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/pom.xml b/smardes-middleware/base/smardes-common-jpa/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/pom.xml
rename to smardes-middleware/base/smardes-common-jpa/pom.xml
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BR.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BR.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BR.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BR.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRBooleanCallable.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRBooleanCallable.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRBooleanCallable.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRBooleanCallable.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRCallable.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRCallable.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRCallable.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRCallable.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRCallableBase.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRCallableBase.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRCallableBase.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRCallableBase.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRIntCallable.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRIntCallable.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRIntCallable.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRIntCallable.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRVoidCallable.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRVoidCallable.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRVoidCallable.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BRVoidCallable.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BaseBR.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BaseBR.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BaseBR.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/BaseBR.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/IBR.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/IBR.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/IBR.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/br/IBR.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/jpa/DAOFactory.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/jpa/DAOFactory.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/jpa/DAOFactory.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/jpa/DAOFactory.java
diff --git a/Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/jpa/GenericDAO.java b/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/jpa/GenericDAO.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/jpa/GenericDAO.java
rename to smardes-middleware/base/smardes-common-jpa/src/main/java/com/camline/projects/smardes/common/jpa/GenericDAO.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/.classpath b/smardes-middleware/base/smardes-common/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/.classpath
rename to smardes-middleware/base/smardes-common/.classpath
diff --git a/Middleware/smardes-middleware/base/smardes-common/.project b/smardes-middleware/base/smardes-common/.project
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/.project
rename to smardes-middleware/base/smardes-common/.project
diff --git a/Middleware/smardes-middleware/base/smardes-common/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/base/smardes-common/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/base/smardes-common/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-common/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/base/smardes-common/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/base/smardes-common/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-common/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/base/smardes-common/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/base/smardes-common/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-common/pom.xml b/smardes-middleware/base/smardes-common/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/pom.xml
rename to smardes-middleware/base/smardes-common/pom.xml
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/AbstractSDService.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/AbstractSDService.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/AbstractSDService.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/AbstractSDService.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/SDService.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/SDService.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/SDService.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/SDService.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/CollectionMap.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/CollectionMap.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/CollectionMap.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/CollectionMap.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/EnumerationIterable.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/EnumerationIterable.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/EnumerationIterable.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/EnumerationIterable.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/PropertyUtils.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/PropertyUtils.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/PropertyUtils.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/collections/PropertyUtils.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/concurrent/CatchingRunnable.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/concurrent/CatchingRunnable.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/concurrent/CatchingRunnable.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/concurrent/CatchingRunnable.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ELFunction.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ELFunction.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ELFunction.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ELFunction.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ELFunctions.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ELFunctions.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ELFunctions.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ELFunctions.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionContext.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionContext.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionContext.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionContext.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionEngine.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionEngine.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionEngine.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionEngine.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionEvaluationException.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionEvaluationException.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionEvaluationException.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionEvaluationException.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionParseException.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionParseException.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionParseException.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/ExpressionParseException.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/PedanticMapELResolver.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/PedanticMapELResolver.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/PedanticMapELResolver.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/PedanticMapELResolver.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/PedanticSimpleResolver.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/PedanticSimpleResolver.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/PedanticSimpleResolver.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/PedanticSimpleResolver.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/DateTimeFunctions.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/DateTimeFunctions.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/DateTimeFunctions.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/DateTimeFunctions.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/ELSupportFunctions.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/ELSupportFunctions.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/ELSupportFunctions.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/ELSupportFunctions.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/IntegerFunctions.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/IntegerFunctions.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/IntegerFunctions.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/IntegerFunctions.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/StringFunctions.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/StringFunctions.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/StringFunctions.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/StringFunctions.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/UUIDFunctions.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/UUIDFunctions.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/UUIDFunctions.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/el/functions/UUIDFunctions.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/AbstractDirectoryMonitor.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/AbstractDirectoryMonitor.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/AbstractDirectoryMonitor.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/AbstractDirectoryMonitor.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/DirectoryMonitor.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/DirectoryMonitor.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/DirectoryMonitor.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/DirectoryMonitor.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/FileMonitor.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/FileMonitor.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/FileMonitor.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/FileMonitor.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/FullDirectoryMonitor.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/FullDirectoryMonitor.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/FullDirectoryMonitor.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/io/FullDirectoryMonitor.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jaxb/JAXBContextFactory.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jaxb/JAXBContextFactory.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jaxb/JAXBContextFactory.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jaxb/JAXBContextFactory.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jaxb/JAXBUtils.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jaxb/JAXBUtils.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jaxb/JAXBUtils.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jaxb/JAXBUtils.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jdbc/SQLUtils.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jdbc/SQLUtils.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jdbc/SQLUtils.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jdbc/SQLUtils.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/AbstractMessageHandler.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/AbstractMessageHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/AbstractMessageHandler.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/AbstractMessageHandler.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/DumpMessageHandler.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/DumpMessageHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/DumpMessageHandler.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/DumpMessageHandler.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/JMSClient.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/JMSClient.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/JMSClient.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/JMSClient.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/JMSContextFactory.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/JMSContextFactory.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/JMSContextFactory.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/JMSContextFactory.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/MessageLogger.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/MessageLogger.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/MessageLogger.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/MessageLogger.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/ShutdownComponent.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/ShutdownComponent.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/ShutdownComponent.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/ShutdownComponent.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/ShutdownHandler.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/ShutdownHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/ShutdownHandler.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/ShutdownHandler.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/Utils.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/Utils.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/Utils.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/jms/Utils.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/logging/LoggerWriter.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/logging/LoggerWriter.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/logging/LoggerWriter.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/logging/LoggerWriter.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/time/ISO8601Parser.java b/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/time/ISO8601Parser.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/time/ISO8601Parser.java
rename to smardes-middleware/base/smardes-common/src/main/java/com/camline/projects/smardes/common/time/ISO8601Parser.java
diff --git a/Middleware/smardes-middleware/base/smardes-common/src/test/java/com/camline/projects/smardes/common/el/TestExpressionEngine.java b/smardes-middleware/base/smardes-common/src/test/java/com/camline/projects/smardes/common/el/TestExpressionEngine.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-common/src/test/java/com/camline/projects/smardes/common/el/TestExpressionEngine.java
rename to smardes-middleware/base/smardes-common/src/test/java/com/camline/projects/smardes/common/el/TestExpressionEngine.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/.classpath b/smardes-middleware/base/smardes-json-api/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/.classpath
rename to smardes-middleware/base/smardes-json-api/.classpath
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/.project b/smardes-middleware/base/smardes-json-api/.project
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/.project
rename to smardes-middleware/base/smardes-json-api/.project
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/base/smardes-json-api/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/base/smardes-json-api/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/base/smardes-json-api/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/pom.xml b/smardes-middleware/base/smardes-json-api/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/pom.xml
rename to smardes-middleware/base/smardes-json-api/pom.xml
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/ErrorResponse.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/ErrorResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/ErrorResponse.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/ErrorResponse.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/JSONB.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/JSONB.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/JSONB.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/JSONB.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/Response.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/Response.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/Response.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/Response.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/SmarDesException.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/SmarDesException.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/SmarDesException.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/SmarDesException.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/TimestampAdapter.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/TimestampAdapter.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/TimestampAdapter.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/TimestampAdapter.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/UUIDAdapter.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/UUIDAdapter.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/UUIDAdapter.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/UUIDAdapter.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/ZonedDateTimeAdapter.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/ZonedDateTimeAdapter.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/ZonedDateTimeAdapter.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/ZonedDateTimeAdapter.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/ELMessage.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/ELMessage.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/ELMessage.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/ELMessage.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/JSONFunctions.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/JSONFunctions.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/JSONFunctions.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/JSONFunctions.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/MessageMap.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/MessageMap.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/MessageMap.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/el/MessageMap.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/CommonErrors.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/CommonErrors.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/CommonErrors.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/CommonErrors.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/JSONServiceHandler.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/JSONServiceHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/JSONServiceHandler.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/JSONServiceHandler.java
diff --git a/Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/JSONServiceHandlerEx.java b/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/JSONServiceHandlerEx.java
similarity index 100%
rename from Middleware/smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/JSONServiceHandlerEx.java
rename to smardes-middleware/base/smardes-json-api/src/main/java/com/camline/projects/smardes/jsonapi/jms/JSONServiceHandlerEx.java
diff --git a/Middleware/smardes-middleware/build/smardes-bom/.project b/smardes-middleware/build/smardes-bom/.project
similarity index 100%
rename from Middleware/smardes-middleware/build/smardes-bom/.project
rename to smardes-middleware/build/smardes-bom/.project
diff --git a/Middleware/smardes-middleware/build/smardes-bom/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/build/smardes-bom/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/build/smardes-bom/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/build/smardes-bom/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/build/smardes-bom/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/build/smardes-bom/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/build/smardes-bom/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/build/smardes-bom/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/build/smardes-bom/pom.xml b/smardes-middleware/build/smardes-bom/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/build/smardes-bom/pom.xml
rename to smardes-middleware/build/smardes-bom/pom.xml
diff --git a/Middleware/Build.md b/smardes-middleware/doc/Build.md
similarity index 100%
rename from Middleware/Build.md
rename to smardes-middleware/doc/Build.md
diff --git a/Middleware/Configuration.md b/smardes-middleware/doc/Configuration.md
similarity index 100%
rename from Middleware/Configuration.md
rename to smardes-middleware/doc/Configuration.md
diff --git a/Middleware/Install.md b/smardes-middleware/doc/Install.md
similarity index 100%
rename from Middleware/Install.md
rename to smardes-middleware/doc/Install.md
diff --git a/Middleware/RuleConfiguration.html b/smardes-middleware/doc/RuleConfiguration.html
similarity index 100%
rename from Middleware/RuleConfiguration.html
rename to smardes-middleware/doc/RuleConfiguration.html
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p1.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p1.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p1.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p1.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p10.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p10.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p10.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p10.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p11.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p11.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p11.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p11.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p12.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p12.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p12.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p12.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p13.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p13.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p13.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p13.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p14.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p14.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p14.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p14.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p15.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p15.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p15.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p15.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p16.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p16.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p16.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p16.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p17.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p17.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p17.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p17.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p18.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p18.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p18.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p18.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p19.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p19.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p19.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p19.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p2.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p2.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p2.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p2.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p20.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p20.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p20.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p20.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p21.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p21.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p21.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p21.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p22.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p22.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p22.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p22.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p23.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p23.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p23.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p23.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p24.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p24.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p24.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p24.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p25.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p25.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p25.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p25.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p26.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p26.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p26.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p26.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p27.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p27.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p27.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p27.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p28.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p28.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p28.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p28.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p29.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p29.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p29.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p29.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p3.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p3.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p3.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p3.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p30.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p30.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p30.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p30.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p31.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p31.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p31.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p31.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p32.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p32.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p32.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p32.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p33.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p33.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p33.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p33.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p34.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p34.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p34.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p34.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p35.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p35.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p35.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p35.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p36.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p36.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p36.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p36.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p37.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p37.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p37.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p37.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p38.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p38.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p38.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p38.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p39.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p39.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p39.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p39.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p4.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p4.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p4.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p4.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p40.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p40.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p40.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p40.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p41.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p41.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p41.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p41.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p42.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p42.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p42.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p42.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p43.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p43.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p43.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p43.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p44.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p44.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p44.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p44.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p45.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p45.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p45.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p45.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p46.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p46.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p46.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p46.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p47.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p47.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p47.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p47.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p48.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p48.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p48.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p48.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p49.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p49.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p49.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p49.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p5.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p5.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p5.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p5.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p50.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p50.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p50.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p50.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p51.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p51.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p51.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p51.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p52.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p52.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p52.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p52.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p53.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p53.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p53.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p53.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p54.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p54.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p54.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p54.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p6.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p6.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p6.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p6.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p7.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p7.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p7.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p7.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p8.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p8.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p8.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p8.png
diff --git a/Middleware/RuleConfiguration_diagrams/RuleConfiguration_p9.png b/smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p9.png
similarity index 100%
rename from Middleware/RuleConfiguration_diagrams/RuleConfiguration_p9.png
rename to smardes-middleware/doc/RuleConfiguration_diagrams/RuleConfiguration_p9.png
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/.classpath b/smardes-middleware/modules/smardes-dbaccess/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/.classpath
rename to smardes-middleware/modules/smardes-dbaccess/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/.project b/smardes-middleware/modules/smardes-dbaccess/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/.project
rename to smardes-middleware/modules/smardes-dbaccess/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-dbaccess/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/pom.xml b/smardes-middleware/modules/smardes-dbaccess/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/pom.xml
rename to smardes-middleware/modules/smardes-dbaccess/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonDataQuery.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonDataQuery.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonDataQuery.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonDataQuery.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonDataRow.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonDataRow.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonDataRow.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonDataRow.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonEvent.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonEvent.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonEvent.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonEvent.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonitoringService.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonitoringService.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonitoringService.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/DBMonitoringService.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/LastEnd.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/LastEnd.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/LastEnd.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/LastEnd.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/LastEndDAO.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/LastEndDAO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/LastEndDAO.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/LastEndDAO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/MonitorConfig.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/MonitorConfig.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/MonitorConfig.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/MonitorConfig.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/TableMonitor.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/TableMonitor.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/TableMonitor.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dbmon/TableMonitor.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/AbstractDataQueryBR.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/AbstractDataQueryBR.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/AbstractDataQueryBR.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/AbstractDataQueryBR.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryBR.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryBR.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryBR.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryBR.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryConfig.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryConfig.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryConfig.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryConfig.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryFunctions.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryFunctions.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryFunctions.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/DataQueryFunctions.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/Error.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/Error.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/Error.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/Error.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/GenericDataQueryBR.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/GenericDataQueryBR.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/GenericDataQueryBR.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/GenericDataQueryBR.java
diff --git a/Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/POJODataQueryBR.java b/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/POJODataQueryBR.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/POJODataQueryBR.java
rename to smardes-middleware/modules/smardes-dbaccess/src/main/java/com/camline/projects/smardes/dq/POJODataQueryBR.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata-api/.classpath b/smardes-middleware/modules/smardes-maindata-api/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata-api/.classpath
rename to smardes-middleware/modules/smardes-maindata-api/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata-api/.project b/smardes-middleware/modules/smardes-maindata-api/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata-api/.project
rename to smardes-middleware/modules/smardes-maindata-api/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-maindata-api/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata-api/pom.xml b/smardes-middleware/modules/smardes-maindata-api/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata-api/pom.xml
rename to smardes-middleware/modules/smardes-maindata-api/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata-api/src/main/java/com/camline/projects/smardes/maindata/api/MainDataFileRequest.java b/smardes-middleware/modules/smardes-maindata-api/src/main/java/com/camline/projects/smardes/maindata/api/MainDataFileRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata-api/src/main/java/com/camline/projects/smardes/maindata/api/MainDataFileRequest.java
rename to smardes-middleware/modules/smardes-maindata-api/src/main/java/com/camline/projects/smardes/maindata/api/MainDataFileRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata-api/src/main/java/com/camline/projects/smardes/maindata/api/MainDataQueryRequest.java b/smardes-middleware/modules/smardes-maindata-api/src/main/java/com/camline/projects/smardes/maindata/api/MainDataQueryRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata-api/src/main/java/com/camline/projects/smardes/maindata/api/MainDataQueryRequest.java
rename to smardes-middleware/modules/smardes-maindata-api/src/main/java/com/camline/projects/smardes/maindata/api/MainDataQueryRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/.classpath b/smardes-middleware/modules/smardes-maindata/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/.classpath
rename to smardes-middleware/modules/smardes-maindata/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/.project b/smardes-middleware/modules/smardes-maindata/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/.project
rename to smardes-middleware/modules/smardes-maindata/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.jpt.core.prefs b/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.jpt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.jpt.core.prefs
rename to smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.jpt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
rename to smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.wst.common.project.facet.core.xml b/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to smardes-middleware/modules/smardes-maindata/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/pom.xml b/smardes-middleware/modules/smardes-maindata/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/pom.xml
rename to smardes-middleware/modules/smardes-maindata/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/AbstractDatabaseImporter.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/AbstractDatabaseImporter.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/AbstractDatabaseImporter.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/AbstractDatabaseImporter.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/AbstractFileToDB.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/AbstractFileToDB.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/AbstractFileToDB.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/AbstractFileToDB.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/ColumnType.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/ColumnType.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/ColumnType.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/ColumnType.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataConfig.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataConfig.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataConfig.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataConfig.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataErrors.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataErrors.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataErrors.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataErrors.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataFileBR.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataFileBR.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataFileBR.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataFileBR.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataService.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataService.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataService.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataService.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataServiceHandler.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataServiceHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataServiceHandler.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataServiceHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataXLSImporter.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataXLSImporter.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataXLSImporter.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/MainDataXLSImporter.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/TableDropper.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/TableDropper.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/TableDropper.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/TableDropper.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/XLSToDB.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/XLSToDB.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/XLSToDB.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/XLSToDB.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileEvent.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileEvent.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileEvent.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileEvent.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileImporter.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileImporter.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileImporter.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileImporter.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileMonitorConfig.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileMonitorConfig.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileMonitorConfig.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVFileMonitorConfig.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVToDB.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVToDB.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVToDB.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/CSVToDB.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/MainDataCSVImporter.java b/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/MainDataCSVImporter.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/MainDataCSVImporter.java
rename to smardes-middleware/modules/smardes-maindata/src/main/java/com/camline/projects/smardes/maindata/csv/MainDataCSVImporter.java
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/resources/META-INF/persistence.xml b/smardes-middleware/modules/smardes-maindata/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/resources/META-INF/persistence.xml
rename to smardes-middleware/modules/smardes-maindata/src/main/resources/META-INF/persistence.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/main/resources/hibernate_maindata.cfg.xml b/smardes-middleware/modules/smardes-maindata/src/main/resources/hibernate_maindata.cfg.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/main/resources/hibernate_maindata.cfg.xml
rename to smardes-middleware/modules/smardes-maindata/src/main/resources/hibernate_maindata.cfg.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-maindata/src/test/config/maindata.properties b/smardes-middleware/modules/smardes-maindata/src/test/config/maindata.properties
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-maindata/src/test/config/maindata.properties
rename to smardes-middleware/modules/smardes-maindata/src/test/config/maindata.properties
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/.classpath b/smardes-middleware/modules/smardes-resources-api/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/.classpath
rename to smardes-middleware/modules/smardes-resources-api/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/.project b/smardes-middleware/modules/smardes-resources-api/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/.project
rename to smardes-middleware/modules/smardes-resources-api/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-resources-api/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/pom.xml b/smardes-middleware/modules/smardes-resources-api/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/pom.xml
rename to smardes-middleware/modules/smardes-resources-api/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetFileRequest.java b/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetFileRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetFileRequest.java
rename to smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetFileRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetFileResponse.java b/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetFileResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetFileResponse.java
rename to smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetFileResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetResourceRequest.java b/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetResourceRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetResourceRequest.java
rename to smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetResourceRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetResourceResponse.java b/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetResourceResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetResourceResponse.java
rename to smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/GetResourceResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/PutResourceRequest.java b/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/PutResourceRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/PutResourceRequest.java
rename to smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/PutResourceRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/PutResourceResponse.java b/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/PutResourceResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/PutResourceResponse.java
rename to smardes-middleware/modules/smardes-resources-api/src/main/java/com/camline/projects/smardes/resources/api/PutResourceResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/.classpath b/smardes-middleware/modules/smardes-resources/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/.classpath
rename to smardes-middleware/modules/smardes-resources/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/.project b/smardes-middleware/modules/smardes-resources/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/.project
rename to smardes-middleware/modules/smardes-resources/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-resources/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-resources/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-resources/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/pom.xml b/smardes-middleware/modules/smardes-resources/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/pom.xml
rename to smardes-middleware/modules/smardes-resources/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/Errors.java b/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/Errors.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/Errors.java
rename to smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/Errors.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/Resource.java b/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/Resource.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/Resource.java
rename to smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/Resource.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceConfig.java b/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceConfig.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceConfig.java
rename to smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceConfig.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceDAO.java b/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceDAO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceDAO.java
rename to smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceDAO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceGC.java b/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceGC.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceGC.java
rename to smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceGC.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceService.java b/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceService.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceService.java
rename to smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceService.java
diff --git a/Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceServiceHandler.java b/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceServiceHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceServiceHandler.java
rename to smardes-middleware/modules/smardes-resources/src/main/java/com/camline/projects/smardes/resource/ResourceServiceHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/.classpath b/smardes-middleware/modules/smardes-rule-engine-api/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/.classpath
rename to smardes-middleware/modules/smardes-rule-engine-api/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/.project b/smardes-middleware/modules/smardes-rule-engine-api/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/.project
rename to smardes-middleware/modules/smardes-rule-engine-api/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-rule-engine-api/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/pom.xml b/smardes-middleware/modules/smardes-rule-engine-api/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/pom.xml
rename to smardes-middleware/modules/smardes-rule-engine-api/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/ActionResult.java b/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/ActionResult.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/ActionResult.java
rename to smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/ActionResult.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/ExecutedRule.java b/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/ExecutedRule.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/ExecutedRule.java
rename to smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/ExecutedRule.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/Summary.java b/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/Summary.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/Summary.java
rename to smardes-middleware/modules/smardes-rule-engine-api/src/main/java/com/camline/projects/smardes/rule/api/Summary.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/.classpath b/smardes-middleware/modules/smardes-rule-engine/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/.classpath
rename to smardes-middleware/modules/smardes-rule-engine/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/.project b/smardes-middleware/modules/smardes-rule-engine/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/.project
rename to smardes-middleware/modules/smardes-rule-engine/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-rule-engine/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/pom.xml b/smardes-middleware/modules/smardes-rule-engine/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/pom.xml
rename to smardes-middleware/modules/smardes-rule-engine/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConfigurationChecker.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConfigurationChecker.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConfigurationChecker.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConfigurationChecker.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConfigurationException.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConfigurationException.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConfigurationException.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConfigurationException.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationContext.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationContext.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationContext.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationContext.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationContextRepository.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationContextRepository.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationContextRepository.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationContextRepository.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationManager.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationManager.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationManager.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ConversationManager.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ExpressionHandler.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ExpressionHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ExpressionHandler.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/ExpressionHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/NamedConditions.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/NamedConditions.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/NamedConditions.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/NamedConditions.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleActionVisitor.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleActionVisitor.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleActionVisitor.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleActionVisitor.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleEngine.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleEngine.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleEngine.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleEngine.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleEngineContext.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleEngineContext.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleEngineContext.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleEngineContext.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupContext.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupContext.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupContext.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupContext.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupHandler.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupHandler.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupVisitor.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupVisitor.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupVisitor.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleGroupVisitor.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleNameVisitor.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleNameVisitor.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleNameVisitor.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/RuleNameVisitor.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/ConversationHandler.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/ConversationHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/ConversationHandler.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/ConversationHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/DumpFileHandler.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/DumpFileHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/DumpFileHandler.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/DumpFileHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/PushMessageHandler.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/PushMessageHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/PushMessageHandler.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/PushMessageHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/RuleActionHandler.java b/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/RuleActionHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/RuleActionHandler.java
rename to smardes-middleware/modules/smardes-rule-engine/src/main/java/com/camline/projects/smardes/rule/actions/RuleActionHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/resources/bindings.xjb b/smardes-middleware/modules/smardes-rule-engine/src/main/resources/bindings.xjb
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/resources/bindings.xjb
rename to smardes-middleware/modules/smardes-rule-engine/src/main/resources/bindings.xjb
diff --git a/Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/resources/rules.xsd b/smardes-middleware/modules/smardes-rule-engine/src/main/resources/rules.xsd
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-rule-engine/src/main/resources/rules.xsd
rename to smardes-middleware/modules/smardes-rule-engine/src/main/resources/rules.xsd
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/.classpath b/smardes-middleware/modules/smardes-todo-api/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/.classpath
rename to smardes-middleware/modules/smardes-todo-api/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/.project b/smardes-middleware/modules/smardes-todo-api/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/.project
rename to smardes-middleware/modules/smardes-todo-api/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-todo-api/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/pom.xml b/smardes-middleware/modules/smardes-todo-api/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/pom.xml
rename to smardes-middleware/modules/smardes-todo-api/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/Errors.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/Errors.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/Errors.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/Errors.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/GenericInstanceResponse.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/GenericInstanceResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/GenericInstanceResponse.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/GenericInstanceResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoAbortInstanceRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoAbortInstanceRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoAbortInstanceRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoAbortInstanceRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoCloseInstanceRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoCloseInstanceRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoCloseInstanceRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoCloseInstanceRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoFindRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoFindRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoFindRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoFindRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoFindResponse.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoFindResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoFindResponse.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoFindResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetDetailsRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetDetailsRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetDetailsRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetDetailsRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetDetailsResponse.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetDetailsResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetDetailsResponse.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetDetailsResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetInstanceDetailsRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetInstanceDetailsRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetInstanceDetailsRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetInstanceDetailsRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetInstanceDetailsResponse.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetInstanceDetailsResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetInstanceDetailsResponse.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetInstanceDetailsResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetRunningInstancesRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetRunningInstancesRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetRunningInstancesRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetRunningInstancesRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetRunningInstancesResponse.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetRunningInstancesResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetRunningInstancesResponse.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoGetRunningInstancesResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepClosedRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepClosedRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepClosedRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepClosedRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepClosedResponse.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepClosedResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepClosedResponse.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepClosedResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepOpenRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepOpenRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepOpenRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoMarkStepOpenRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoStartInstanceRequest.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoStartInstanceRequest.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoStartInstanceRequest.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoStartInstanceRequest.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoStartInstanceResponse.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoStartInstanceResponse.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoStartInstanceResponse.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/ToDoStartInstanceResponse.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoClosedStepDTO.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoClosedStepDTO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoClosedStepDTO.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoClosedStepDTO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoHeaderDTO.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoHeaderDTO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoHeaderDTO.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoHeaderDTO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoInstanceDTO.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoInstanceDTO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoInstanceDTO.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoInstanceDTO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoStepDTO.java b/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoStepDTO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoStepDTO.java
rename to smardes-middleware/modules/smardes-todo-api/src/main/java/com/camline/projects/smardes/todo/api/dto/ToDoStepDTO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/.classpath b/smardes-middleware/modules/smardes-todo/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/.classpath
rename to smardes-middleware/modules/smardes-todo/.classpath
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/.project b/smardes-middleware/modules/smardes-todo/.project
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/.project
rename to smardes-middleware/modules/smardes-todo/.project
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/modules/smardes-todo/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/modules/smardes-todo/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/modules/smardes-todo/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/pom.xml b/smardes-middleware/modules/smardes-todo/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/pom.xml
rename to smardes-middleware/modules/smardes-todo/pom.xml
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/AbstractToDoHandler.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/AbstractToDoHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/AbstractToDoHandler.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/AbstractToDoHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoAbortInstance.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoAbortInstance.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoAbortInstance.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoAbortInstance.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoCloseInstance.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoCloseInstance.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoCloseInstance.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoCloseInstance.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoGetInstanceDetails.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoGetInstanceDetails.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoGetInstanceDetails.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoGetInstanceDetails.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoGetRunningInstances.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoGetRunningInstances.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoGetRunningInstances.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoGetRunningInstances.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoMarkStepClosed.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoMarkStepClosed.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoMarkStepClosed.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoMarkStepClosed.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoMarkStepOpen.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoMarkStepOpen.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoMarkStepOpen.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoMarkStepOpen.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoService.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoService.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoService.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoService.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoServiceHandler.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoServiceHandler.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoServiceHandler.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoServiceHandler.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoStartInstance.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoStartInstance.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoStartInstance.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/ToDoStartInstance.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoClosedStep.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoClosedStep.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoClosedStep.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoClosedStep.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoClosedStepDAO.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoClosedStepDAO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoClosedStepDAO.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoClosedStepDAO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoHeaderDAO.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoHeaderDAO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoHeaderDAO.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoHeaderDAO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoInstance.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoInstance.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoInstance.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoInstance.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoInstanceDAO.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoInstanceDAO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoInstanceDAO.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoInstanceDAO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoStepDAO.java b/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoStepDAO.java
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoStepDAO.java
rename to smardes-middleware/modules/smardes-todo/src/main/java/com/camline/projects/smardes/todo/entities/ToDoStepDAO.java
diff --git a/Middleware/smardes-middleware/modules/smardes-todo/src/test/config/todo.properties b/smardes-middleware/modules/smardes-todo/src/test/config/todo.properties
similarity index 100%
rename from Middleware/smardes-middleware/modules/smardes-todo/src/test/config/todo.properties
rename to smardes-middleware/modules/smardes-todo/src/test/config/todo.properties
diff --git a/Middleware/smardes-middleware/pom.xml b/smardes-middleware/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/pom.xml
rename to smardes-middleware/pom.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/.classpath b/smardes-middleware/smardes-backend-services/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/.classpath
rename to smardes-middleware/smardes-backend-services/.classpath
diff --git a/Middleware/smardes-middleware/smardes-backend-services/.project b/smardes-middleware/smardes-backend-services/.project
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/.project
rename to smardes-middleware/smardes-backend-services/.project
diff --git a/Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/smardes-backend-services/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/smardes-backend-services/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/smardes-backend-services/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/smardes-backend-services/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.jpt.core.prefs b/smardes-middleware/smardes-backend-services/.settings/org.eclipse.jpt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.jpt.core.prefs
rename to smardes-middleware/smardes-backend-services/.settings/org.eclipse.jpt.core.prefs
diff --git a/Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/smardes-backend-services/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/smardes-backend-services/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/smardes-middleware/smardes-backend-services/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
rename to smardes-middleware/smardes-backend-services/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.wst.common.project.facet.core.xml b/smardes-middleware/smardes-backend-services/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to smardes-middleware/smardes-backend-services/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/StartServices.launch b/smardes-middleware/smardes-backend-services/StartServices.launch
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/StartServices.launch
rename to smardes-middleware/smardes-backend-services/StartServices.launch
diff --git a/Middleware/smardes-middleware/smardes-backend-services/StopServices.launch b/smardes-middleware/smardes-backend-services/StopServices.launch
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/StopServices.launch
rename to smardes-middleware/smardes-backend-services/StopServices.launch
diff --git a/Middleware/smardes-middleware/smardes-backend-services/pom.xml b/smardes-middleware/smardes-backend-services/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/pom.xml
rename to smardes-middleware/smardes-backend-services/pom.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib.xml b/smardes-middleware/smardes-backend-services/src/assembly/distrib.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib.xml
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/DatabaseManager.cmd b/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/DatabaseManager.cmd
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/DatabaseManager.cmd
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/DatabaseManager.cmd
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartJava.cmd b/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartJava.cmd
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartJava.cmd
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartJava.cmd
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartSDServices.cmd b/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartSDServices.cmd
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartSDServices.cmd
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartSDServices.cmd
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartSDServices.sh b/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartSDServices.sh
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartSDServices.sh
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StartSDServices.sh
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StopSDServices.cmd b/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StopSDServices.cmd
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StopSDServices.cmd
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/StopSDServices.cmd
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/service.bat b/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/service.bat
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/service.bat
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/bin/service.bat
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/dbmon/todolist.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/dbmon/todolist.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/dbmon/todolist.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/dbmon/todolist.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/maindata.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/maindata.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/maindata.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/maindata.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/_readme.txt b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/_readme.txt
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/_readme.txt
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/_readme.txt
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/common.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/common.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/common.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/common.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/todolist.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/todolist.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/todolist.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/queries/todolist.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/resources.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/resources.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/resources.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/resources.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/.gitignore b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/.gitignore
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/.gitignore
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/.gitignore
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/_readme.txt b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/_readme.txt
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/_readme.txt
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/_readme.txt
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/chat.xml b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/chat.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/chat.xml
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/chat.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/common.xml b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/common.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/common.xml
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/common.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/disabled/_readme.txt b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/disabled/_readme.txt
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/disabled/_readme.txt
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/disabled/_readme.txt
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/job_start.xml b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/job_start.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/job_start.xml
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/job_start.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/todo.xml b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/todo.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/todo.xml
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/rules/todo.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/templates/dump_todolist.vm b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/templates/dump_todolist.vm
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/templates/dump_todolist.vm
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/templates/dump_todolist.vm
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/todo.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/todo.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/config/todo.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/config/todo.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/generated/readme.txt b/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/generated/readme.txt
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/generated/readme.txt
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/db/generated/readme.txt
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes-schema-create.sql b/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes-schema-create.sql
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes-schema-create.sql
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes-schema-create.sql
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes-schema-drop.sql b/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes-schema-drop.sql
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes-schema-drop.sql
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes-schema-drop.sql
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes.script b/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes.script
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes.script
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/db/smardes.script
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/externaldb/META-INF/persistence.xml b/smardes-middleware/smardes-backend-services/src/assembly/distrib/externaldb/META-INF/persistence.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/externaldb/META-INF/persistence.xml
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/externaldb/META-INF/persistence.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/externaldb/hibernate_sample.cfg.xml b/smardes-middleware/smardes-backend-services/src/assembly/distrib/externaldb/hibernate_sample.cfg.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/externaldb/hibernate_sample.cfg.xml
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/externaldb/hibernate_sample.cfg.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/maindata/xlsx/TODOSample.xlsx b/smardes-middleware/smardes-backend-services/src/assembly/distrib/maindata/xlsx/TODOSample.xlsx
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/maindata/xlsx/TODOSample.xlsx
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/maindata/xlsx/TODOSample.xlsx
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/artemis.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/artemis.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/artemis.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/artemis.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/hsqldb.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/hsqldb.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/hsqldb.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/hsqldb.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/log4j.properties b/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/log4j.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/log4j.properties
rename to smardes-middleware/smardes-backend-services/src/assembly/distrib/properties/log4j.properties
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/StartServices.java b/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/StartServices.java
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/StartServices.java
rename to smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/StartServices.java
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/db/DatabaseServer.java b/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/db/DatabaseServer.java
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/db/DatabaseServer.java
rename to smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/db/DatabaseServer.java
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/db/JPAService.java b/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/db/JPAService.java
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/db/JPAService.java
rename to smardes-middleware/smardes-backend-services/src/main/java/com/camline/projects/smardes/db/JPAService.java
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/main/resources/META-INF/persistence.xml b/smardes-middleware/smardes-backend-services/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/main/resources/META-INF/persistence.xml
rename to smardes-middleware/smardes-backend-services/src/main/resources/META-INF/persistence.xml
diff --git a/Middleware/smardes-middleware/smardes-backend-services/src/main/resources/hibernate_smardes.cfg.xml b/smardes-middleware/smardes-backend-services/src/main/resources/hibernate_smardes.cfg.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-backend-services/src/main/resources/hibernate_smardes.cfg.xml
rename to smardes-middleware/smardes-backend-services/src/main/resources/hibernate_smardes.cfg.xml
diff --git a/Middleware/smardes-middleware/smardes-distribution/.project b/smardes-middleware/smardes-distribution/.project
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/.project
rename to smardes-middleware/smardes-distribution/.project
diff --git a/Middleware/smardes-middleware/smardes-distribution/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/smardes-distribution/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/smardes-distribution/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/smardes-distribution/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/smardes-distribution/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/smardes-distribution/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/smardes-distribution/pom.xml b/smardes-middleware/smardes-distribution/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/pom.xml
rename to smardes-middleware/smardes-distribution/pom.xml
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib.xml b/smardes-middleware/smardes-distribution/src/assembly/distrib.xml
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib.xml
rename to smardes-middleware/smardes-distribution/src/assembly/distrib.xml
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/ShowServices.bat b/smardes-middleware/smardes-distribution/src/assembly/distrib/ShowServices.bat
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/ShowServices.bat
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/ShowServices.bat
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/ShowServices.ps1 b/smardes-middleware/smardes-distribution/src/assembly/distrib/ShowServices.ps1
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/ShowServices.ps1
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/ShowServices.ps1
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install.bat b/smardes-middleware/smardes-distribution/src/assembly/distrib/install.bat
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install.bat
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/install.bat
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/StartArtemis.cmd b/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/StartArtemis.cmd
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/StartArtemis.cmd
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/StartArtemis.cmd
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/StopArtemis.cmd b/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/StopArtemis.cmd
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/StopArtemis.cmd
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/StopArtemis.cmd
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/service.bat b/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/service.bat
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/service.bat
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/bin/service.bat
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/etc/artemis-roles.properties b/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/etc/artemis-roles.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/etc/artemis-roles.properties
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/etc/artemis-roles.properties
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/etc/logging.properties b/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/etc/logging.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/etc/logging.properties
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/install/overwrite/etc/logging.properties
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/patched/etc/artemis-users-appendix.properties b/smardes-middleware/smardes-distribution/src/assembly/distrib/install/patched/etc/artemis-users-appendix.properties
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/patched/etc/artemis-users-appendix.properties
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/install/patched/etc/artemis-users-appendix.properties
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/patched/etc/patch-broker-xml.xslt b/smardes-middleware/smardes-distribution/src/assembly/distrib/install/patched/etc/patch-broker-xml.xslt
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/install/patched/etc/patch-broker-xml.xslt
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/install/patched/etc/patch-broker-xml.xslt
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/readme.txt b/smardes-middleware/smardes-distribution/src/assembly/distrib/readme.txt
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/readme.txt
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/readme.txt
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/tools/sqlline/readme.txt b/smardes-middleware/smardes-distribution/src/assembly/distrib/tools/sqlline/readme.txt
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/tools/sqlline/readme.txt
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/tools/sqlline/readme.txt
diff --git a/Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/tools/sqlline/sqlline.bat b/smardes-middleware/smardes-distribution/src/assembly/distrib/tools/sqlline/sqlline.bat
similarity index 100%
rename from Middleware/smardes-middleware/smardes-distribution/src/assembly/distrib/tools/sqlline/sqlline.bat
rename to smardes-middleware/smardes-distribution/src/assembly/distrib/tools/sqlline/sqlline.bat
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/.classpath b/smardes-middleware/test/smardes-integration-test/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/.classpath
rename to smardes-middleware/test/smardes-integration-test/.classpath
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/.project b/smardes-middleware/test/smardes-integration-test/.project
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/.project
rename to smardes-middleware/test/smardes-integration-test/.project
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/test/smardes-integration-test/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/pom.xml b/smardes-middleware/test/smardes-integration-test/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/pom.xml
rename to smardes-middleware/test/smardes-integration-test/pom.xml
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/APIInvoker.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/APIInvoker.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/APIInvoker.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/APIInvoker.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/AllTests.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/AllTests.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/AllTests.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/AllTests.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/ConditionalPatching.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/ConditionalPatching.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/ConditionalPatching.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/ConditionalPatching.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/ELAssert.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/ELAssert.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/ELAssert.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/ELAssert.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/JMSClientEx.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/JMSClientEx.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/JMSClientEx.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/JMSClientEx.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestAPIStandardErrors.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestAPIStandardErrors.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestAPIStandardErrors.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestAPIStandardErrors.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestDBMonitor.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestDBMonitor.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestDBMonitor.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestDBMonitor.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestMaindataAPIs.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestMaindataAPIs.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestMaindataAPIs.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestMaindataAPIs.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestResourceAPIs.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestResourceAPIs.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestResourceAPIs.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestResourceAPIs.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestTODOAPIs.java b/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestTODOAPIs.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestTODOAPIs.java
rename to smardes-middleware/test/smardes-integration-test/src/test/java/com/camline/projects/smardes/clients/TestTODOAPIs.java
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/dbmon/test.properties b/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/dbmon/test.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/dbmon/test.properties
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/config/dbmon/test.properties
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/maindata.properties b/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/maindata.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/maindata.properties
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/config/maindata.properties
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/queries/dq.properties b/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/queries/dq.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/queries/dq.properties
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/config/queries/dq.properties
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/resources.properties b/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/resources.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/resources.properties
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/config/resources.properties
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/rules/rules.xml b/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/rules/rules.xml
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/rules/rules.xml
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/config/rules/rules.xml
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/todo.properties b/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/todo.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/config/todo.properties
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/config/todo.properties
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/csv/Benutzergruppen.csv b/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/csv/Benutzergruppen.csv
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/csv/Benutzergruppen.csv
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/csv/Benutzergruppen.csv
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/csv/Devices.csv b/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/csv/Devices.csv
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/csv/Devices.csv
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/csv/Devices.csv
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/raw/devices/Device1.json b/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/raw/devices/Device1.json
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/raw/devices/Device1.json
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/raw/devices/Device1.json
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/xlsx/Maintenance.xlsx b/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/xlsx/Maintenance.xlsx
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/xlsx/Maintenance.xlsx
rename to smardes-middleware/test/smardes-integration-test/src/test/runtime/maindata/xlsx/Maintenance.xlsx
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/test-runtime/properties/artemis.properties b/smardes-middleware/test/smardes-integration-test/src/test/test-runtime/properties/artemis.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/test-runtime/properties/artemis.properties
rename to smardes-middleware/test/smardes-integration-test/src/test/test-runtime/properties/artemis.properties
diff --git a/Middleware/smardes-middleware/test/smardes-integration-test/src/test/test-runtime/properties/log4j.properties b/smardes-middleware/test/smardes-integration-test/src/test/test-runtime/properties/log4j.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-integration-test/src/test/test-runtime/properties/log4j.properties
rename to smardes-middleware/test/smardes-integration-test/src/test/test-runtime/properties/log4j.properties
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/.classpath b/smardes-middleware/test/smardes-test-clients/.classpath
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/.classpath
rename to smardes-middleware/test/smardes-test-clients/.classpath
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/.project b/smardes-middleware/test/smardes-test-clients/.project
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/.project
rename to smardes-middleware/test/smardes-test-clients/.project
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.core.resources.prefs b/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.core.resources.prefs
rename to smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.core.resources.prefs
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.jdt.core.prefs b/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.jdt.core.prefs
rename to smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.jdt.core.prefs
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.m2e.core.prefs b/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.m2e.core.prefs
rename to smardes-middleware/test/smardes-test-clients/.settings/org.eclipse.m2e.core.prefs
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/pom.xml b/smardes-middleware/test/smardes-test-clients/pom.xml
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/pom.xml
rename to smardes-middleware/test/smardes-test-clients/pom.xml
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib.xml b/smardes-middleware/test/smardes-test-clients/src/assembly/distrib.xml
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib.xml
rename to smardes-middleware/test/smardes-test-clients/src/assembly/distrib.xml
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/MainDataClients.bat b/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/MainDataClients.bat
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/MainDataClients.bat
rename to smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/MainDataClients.bat
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/ResourceClients.bat b/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/ResourceClients.bat
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/ResourceClients.bat
rename to smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/ResourceClients.bat
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/ToDoClients.bat b/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/ToDoClients.bat
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/ToDoClients.bat
rename to smardes-middleware/test/smardes-test-clients/src/assembly/distrib/bin/ToDoClients.bat
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/properties/artemis.properties b/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/properties/artemis.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/properties/artemis.properties
rename to smardes-middleware/test/smardes-test-clients/src/assembly/distrib/properties/artemis.properties
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/properties/log4j.properties b/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/properties/log4j.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/assembly/distrib/properties/log4j.properties
rename to smardes-middleware/test/smardes-test-clients/src/assembly/distrib/properties/log4j.properties
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/AbstractClients.java b/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/AbstractClients.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/AbstractClients.java
rename to smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/AbstractClients.java
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ConsoleInput.java b/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ConsoleInput.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ConsoleInput.java
rename to smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ConsoleInput.java
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/MainDataClients.java b/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/MainDataClients.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/MainDataClients.java
rename to smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/MainDataClients.java
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ResourceClients.java b/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ResourceClients.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ResourceClients.java
rename to smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ResourceClients.java
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ToDoClients.java b/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ToDoClients.java
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ToDoClients.java
rename to smardes-middleware/test/smardes-test-clients/src/main/java/com/camline/projects/smardes/clients/ToDoClients.java
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/test/properties/artemis.properties b/smardes-middleware/test/smardes-test-clients/src/test/properties/artemis.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/test/properties/artemis.properties
rename to smardes-middleware/test/smardes-test-clients/src/test/properties/artemis.properties
diff --git a/Middleware/smardes-middleware/test/smardes-test-clients/src/test/properties/log4j.properties b/smardes-middleware/test/smardes-test-clients/src/test/properties/log4j.properties
similarity index 100%
rename from Middleware/smardes-middleware/test/smardes-test-clients/src/test/properties/log4j.properties
rename to smardes-middleware/test/smardes-test-clients/src/test/properties/log4j.properties