diff --git a/sne-xacml-demo/LICENSE b/demo/LICENSE
similarity index 100%
rename from sne-xacml-demo/LICENSE
rename to demo/LICENSE
diff --git a/sne-xacml-demo/README.md b/demo/README.md
similarity index 100%
rename from sne-xacml-demo/README.md
rename to demo/README.md
diff --git a/sne-xacml-core/policies/sample-xacml3/continue-a-xacml3.xml b/demo/policies/continue-a-xacml3.xml
old mode 100644
new mode 100755
similarity index 100%
rename from sne-xacml-core/policies/sample-xacml3/continue-a-xacml3.xml
rename to demo/policies/continue-a-xacml3.xml
diff --git a/sne-xacml-demo/policies/continue-a.xml b/demo/policies/continue-a.xml
similarity index 100%
rename from sne-xacml-demo/policies/continue-a.xml
rename to demo/policies/continue-a.xml
diff --git a/sne-xacml-demo/pom.xml b/demo/pom.xml
similarity index 90%
rename from sne-xacml-demo/pom.xml
rename to demo/pom.xml
index 5de3093..052cd1f 100755
--- a/sne-xacml-demo/pom.xml
+++ b/demo/pom.xml
@@ -2,11 +2,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>nl.uva.sne</groupId>
-        <artifactId>sne-xacml</artifactId>
-        <version>0.0.4-SNAPSHOT</version>
+        <artifactId>sne-xacml-project</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>sne-xacml-demo</artifactId>
-    <name>SNE XACML Engine Demo</name>
+    <name>SNE XACML Engine Demo Project</name>
     <description>Validate SNE-XACML with SunXACML</description>
 
     <properties>
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sne-xacml-core</artifactId>
+            <artifactId>sne-xacml</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/sne-xacml-demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/RequestGenerator2.java b/demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/RequestGenerator2.java
similarity index 100%
rename from sne-xacml-demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/RequestGenerator2.java
rename to demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/RequestGenerator2.java
diff --git a/sne-xacml-demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/RequestGenerator23.java b/demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/RequestGenerator23.java
similarity index 100%
rename from sne-xacml-demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/RequestGenerator23.java
rename to demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/RequestGenerator23.java
diff --git a/sne-xacml-demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/SunXACMLUtil.java b/demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/SunXACMLUtil.java
similarity index 100%
rename from sne-xacml-demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/SunXACMLUtil.java
rename to demo/src/main/java/nl/uva/sne/xacml/evaltest/sunxacml/SunXACMLUtil.java
diff --git a/sne-xacml-demo/src/test/java/nl/uva/sne/xacml/evaltest/SNEXACMLValidationTest.java b/demo/src/test/java/nl/uva/sne/xacml/evaltest/SNEXACMLValidationTest.java
similarity index 100%
rename from sne-xacml-demo/src/test/java/nl/uva/sne/xacml/evaltest/SNEXACMLValidationTest.java
rename to demo/src/test/java/nl/uva/sne/xacml/evaltest/SNEXACMLValidationTest.java
diff --git a/pom.xml b/pom.xml
index aeb68e0..4449dc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>nl.uva.sne</groupId>
-  <artifactId>sne-xacml</artifactId>
-  <version>0.0.4-SNAPSHOT</version>
+  <artifactId>sne-xacml-project</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>SNE-XACML Engine</name>
@@ -14,8 +14,8 @@
   <inceptionYear>2012</inceptionYear>
 
   <modules>
-    <module>sne-xacml-core</module>
-    <module>sne-xacml-demo</module>
+    <module>sne-xacml</module>
+    <module>demo</module>
   </modules>
 
   <organization>
diff --git a/sne-xacml-core/etc/header.txt b/sne-xacml/etc/header.txt
similarity index 100%
rename from sne-xacml-core/etc/header.txt
rename to sne-xacml/etc/header.txt
diff --git a/sne-xacml-demo/policies/continue-a-xacml3.xml b/sne-xacml/policies/sample-xacml3/continue-a-xacml3.xml
old mode 100755
new mode 100644
similarity index 100%
rename from sne-xacml-demo/policies/continue-a-xacml3.xml
rename to sne-xacml/policies/sample-xacml3/continue-a-xacml3.xml
diff --git a/sne-xacml-core/policies/synthetic360/synthetic360.xml b/sne-xacml/policies/synthetic360/synthetic360.xml
similarity index 100%
rename from sne-xacml-core/policies/synthetic360/synthetic360.xml
rename to sne-xacml/policies/synthetic360/synthetic360.xml
diff --git a/sne-xacml-core/policies/upperlicl/PPS-PIP-Role.xml b/sne-xacml/policies/upperlicl/PPS-PIP-Role.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/PPS-PIP-Role.xml
rename to sne-xacml/policies/upperlicl/PPS-PIP-Role.xml
diff --git a/sne-xacml-core/policies/upperlicl/PPS-VIO-N-Role.xml b/sne-xacml/policies/upperlicl/PPS-VIO-N-Role.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/PPS-VIO-N-Role.xml
rename to sne-xacml/policies/upperlicl/PPS-VIO-N-Role.xml
diff --git a/sne-xacml-core/policies/upperlicl/PPS-VIO-Role.xml b/sne-xacml/policies/upperlicl/PPS-VIO-Role.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/PPS-VIO-Role.xml
rename to sne-xacml/policies/upperlicl/PPS-VIO-Role.xml
diff --git a/sne-xacml-core/policies/upperlicl/RPS-PIP-Role.xml b/sne-xacml/policies/upperlicl/RPS-PIP-Role.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/RPS-PIP-Role.xml
rename to sne-xacml/policies/upperlicl/RPS-PIP-Role.xml
diff --git a/sne-xacml-core/policies/upperlicl/RPS-VIO-N-Role.xml b/sne-xacml/policies/upperlicl/RPS-VIO-N-Role.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/RPS-VIO-N-Role.xml
rename to sne-xacml/policies/upperlicl/RPS-VIO-N-Role.xml
diff --git a/sne-xacml-core/policies/upperlicl/RPS-VIO-Role.xml b/sne-xacml/policies/upperlicl/RPS-VIO-Role.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/RPS-VIO-Role.xml
rename to sne-xacml/policies/upperlicl/RPS-VIO-Role.xml
diff --git a/sne-xacml-core/policies/upperlicl/permission-cci-operations.xml b/sne-xacml/policies/upperlicl/permission-cci-operations.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/permission-cci-operations.xml
rename to sne-xacml/policies/upperlicl/permission-cci-operations.xml
diff --git a/sne-xacml-core/policies/upperlicl/permission-mli-replanning-vlink-operations.xml b/sne-xacml/policies/upperlicl/permission-mli-replanning-vlink-operations.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/permission-mli-replanning-vlink-operations.xml
rename to sne-xacml/policies/upperlicl/permission-mli-replanning-vlink-operations.xml
diff --git a/sne-xacml-core/policies/upperlicl/permission-mli-replanning-vr-it-operations.xml b/sne-xacml/policies/upperlicl/permission-mli-replanning-vr-it-operations.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/permission-mli-replanning-vr-it-operations.xml
rename to sne-xacml/policies/upperlicl/permission-mli-replanning-vr-it-operations.xml
diff --git a/sne-xacml-core/policies/upperlicl/permission-mli-vi-operations.xml b/sne-xacml/policies/upperlicl/permission-mli-vi-operations.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/permission-mli-vi-operations.xml
rename to sne-xacml/policies/upperlicl/permission-mli-vi-operations.xml
diff --git a/sne-xacml-core/policies/upperlicl/permission-mli-vi-request-operations.xml b/sne-xacml/policies/upperlicl/permission-mli-vi-request-operations.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/permission-mli-vi-request-operations.xml
rename to sne-xacml/policies/upperlicl/permission-mli-vi-request-operations.xml
diff --git a/sne-xacml-core/policies/upperlicl/permission-ros-notifications.xml b/sne-xacml/policies/upperlicl/permission-ros-notifications.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/permission-ros-notifications.xml
rename to sne-xacml/policies/upperlicl/permission-ros-notifications.xml
diff --git a/sne-xacml-core/policies/upperlicl/permission-sli-operations.xml b/sne-xacml/policies/upperlicl/permission-sli-operations.xml
similarity index 100%
rename from sne-xacml-core/policies/upperlicl/permission-sli-operations.xml
rename to sne-xacml/policies/upperlicl/permission-sli-operations.xml
diff --git a/sne-xacml-core/policies/xacml3-mli-interface.xml b/sne-xacml/policies/xacml3-mli-interface.xml
similarity index 100%
rename from sne-xacml-core/policies/xacml3-mli-interface.xml
rename to sne-xacml/policies/xacml3-mli-interface.xml
diff --git a/sne-xacml-core/pom.xml b/sne-xacml/pom.xml
similarity index 92%
rename from sne-xacml-core/pom.xml
rename to sne-xacml/pom.xml
index a04af27..c646128 100644
--- a/sne-xacml-core/pom.xml
+++ b/sne-xacml/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>nl.uva.sne</groupId>
-        <artifactId>sne-xacml</artifactId>
-        <version>0.0.4-SNAPSHOT</version>
+        <artifactId>sne-xacml-project</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>sne-xacml-core</artifactId>
+    <artifactId>sne-xacml</artifactId>
     <packaging>bundle</packaging>
 
-    <name>SNE XACML Core</name>
+    <name>SNE XACML Engine</name>
 
     <dependencies>
       <dependency>
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/Decision.java b/sne-xacml/src/main/java/nl/uva/sne/midd/Decision.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/Decision.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/Decision.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/DecisionType.java b/sne-xacml/src/main/java/nl/uva/sne/midd/DecisionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/DecisionType.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/DecisionType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/MIDDException.java b/sne-xacml/src/main/java/nl/uva/sne/midd/MIDDException.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/MIDDException.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/MIDDException.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/UnmatchedException.java b/sne-xacml/src/main/java/nl/uva/sne/midd/UnmatchedException.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/UnmatchedException.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/UnmatchedException.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/Variable.java b/sne-xacml/src/main/java/nl/uva/sne/midd/Variable.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/Variable.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/Variable.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/CombiningAlgType.java b/sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/CombiningAlgType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/CombiningAlgType.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/CombiningAlgType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/CombiningAlgorithm.java b/sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/CombiningAlgorithm.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/CombiningAlgorithm.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/CombiningAlgorithm.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/DenyOverridesAlg.java b/sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/DenyOverridesAlg.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/DenyOverridesAlg.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/DenyOverridesAlg.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/DenyUnlessPermitAlg.java b/sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/DenyUnlessPermitAlg.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/DenyUnlessPermitAlg.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/DenyUnlessPermitAlg.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/FirstApplicableAlg.java b/sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/FirstApplicableAlg.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/FirstApplicableAlg.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/FirstApplicableAlg.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/PermitOverridesAlg.java b/sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/PermitOverridesAlg.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/PermitOverridesAlg.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/PermitOverridesAlg.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/PermitUnlessDenyAlg.java b/sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/PermitUnlessDenyAlg.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/algorithms/PermitUnlessDenyAlg.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/algorithms/PermitUnlessDenyAlg.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/builders/ConjunctiveBuilder.java b/sne-xacml/src/main/java/nl/uva/sne/midd/builders/ConjunctiveBuilder.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/builders/ConjunctiveBuilder.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/builders/ConjunctiveBuilder.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/builders/DisjunctiveBuilder.java b/sne-xacml/src/main/java/nl/uva/sne/midd/builders/DisjunctiveBuilder.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/builders/DisjunctiveBuilder.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/builders/DisjunctiveBuilder.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/builders/MIDDCombiner.java b/sne-xacml/src/main/java/nl/uva/sne/midd/builders/MIDDCombiner.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/builders/MIDDCombiner.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/builders/MIDDCombiner.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/datatype/AnyURI.java b/sne-xacml/src/main/java/nl/uva/sne/midd/datatype/AnyURI.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/datatype/AnyURI.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/datatype/AnyURI.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/datatype/XMLDateTime.java b/sne-xacml/src/main/java/nl/uva/sne/midd/datatype/XMLDateTime.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/datatype/XMLDateTime.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/datatype/XMLDateTime.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/datatype/XMLDuration.java b/sne-xacml/src/main/java/nl/uva/sne/midd/datatype/XMLDuration.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/datatype/XMLDuration.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/datatype/XMLDuration.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/datatype/XMLTime.java b/sne-xacml/src/main/java/nl/uva/sne/midd/datatype/XMLTime.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/datatype/XMLTime.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/datatype/XMLTime.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/AbstractEdge.java b/sne-xacml/src/main/java/nl/uva/sne/midd/edges/AbstractEdge.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/AbstractEdge.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/edges/AbstractEdge.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/AnyURIEdge.java b/sne-xacml/src/main/java/nl/uva/sne/midd/edges/AnyURIEdge.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/AnyURIEdge.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/edges/AnyURIEdge.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/BooleanEdge.java b/sne-xacml/src/main/java/nl/uva/sne/midd/edges/BooleanEdge.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/BooleanEdge.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/edges/BooleanEdge.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/DateTimeEdge.java b/sne-xacml/src/main/java/nl/uva/sne/midd/edges/DateTimeEdge.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/DateTimeEdge.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/edges/DateTimeEdge.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/DoubleEdge.java b/sne-xacml/src/main/java/nl/uva/sne/midd/edges/DoubleEdge.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/DoubleEdge.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/edges/DoubleEdge.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/IntegerEdge.java b/sne-xacml/src/main/java/nl/uva/sne/midd/edges/IntegerEdge.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/IntegerEdge.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/edges/IntegerEdge.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/StringEdge.java b/sne-xacml/src/main/java/nl/uva/sne/midd/edges/StringEdge.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/edges/StringEdge.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/edges/StringEdge.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/interval/EndPoint.java b/sne-xacml/src/main/java/nl/uva/sne/midd/interval/EndPoint.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/interval/EndPoint.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/interval/EndPoint.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/interval/Interval.java b/sne-xacml/src/main/java/nl/uva/sne/midd/interval/Interval.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/interval/Interval.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/interval/Interval.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/AbstractNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/AbstractNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/AbstractNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/AbstractNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/AnyURINode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/AnyURINode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/AnyURINode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/AnyURINode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/BooleanNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/BooleanNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/BooleanNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/BooleanNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/DateTimeNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/DateTimeNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/DateTimeNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/DateTimeNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/DoubleNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/DoubleNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/DoubleNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/DoubleNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/DurationNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/DurationNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/DurationNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/DurationNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/ExternalNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/ExternalNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/ExternalNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/ExternalNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/IntegerNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/IntegerNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/IntegerNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/IntegerNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/InternalNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/InternalNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/InternalNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/InternalNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/StringNode.java b/sne-xacml/src/main/java/nl/uva/sne/midd/nodes/StringNode.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/nodes/StringNode.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/nodes/StringNode.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/obligations/InternalNodeState.java b/sne-xacml/src/main/java/nl/uva/sne/midd/obligations/InternalNodeState.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/obligations/InternalNodeState.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/obligations/InternalNodeState.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/obligations/Obligation.java b/sne-xacml/src/main/java/nl/uva/sne/midd/obligations/Obligation.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/obligations/Obligation.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/obligations/Obligation.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/obligations/ObligationExpression.java b/sne-xacml/src/main/java/nl/uva/sne/midd/obligations/ObligationExpression.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/obligations/ObligationExpression.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/obligations/ObligationExpression.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/partition/Partition.java b/sne-xacml/src/main/java/nl/uva/sne/midd/partition/Partition.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/partition/Partition.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/partition/Partition.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/partition/PartitionBuilder.java b/sne-xacml/src/main/java/nl/uva/sne/midd/partition/PartitionBuilder.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/partition/PartitionBuilder.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/partition/PartitionBuilder.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/util/EdgeUtils.java b/sne-xacml/src/main/java/nl/uva/sne/midd/util/EdgeUtils.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/util/EdgeUtils.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/util/EdgeUtils.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/util/EvaluationUtils.java b/sne-xacml/src/main/java/nl/uva/sne/midd/util/EvaluationUtils.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/util/EvaluationUtils.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/util/EvaluationUtils.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/util/GenericUtils.java b/sne-xacml/src/main/java/nl/uva/sne/midd/util/GenericUtils.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/util/GenericUtils.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/util/GenericUtils.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/util/IntervalUtils.java b/sne-xacml/src/main/java/nl/uva/sne/midd/util/IntervalUtils.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/util/IntervalUtils.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/util/IntervalUtils.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/util/MIDDUtils.java b/sne-xacml/src/main/java/nl/uva/sne/midd/util/MIDDUtils.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/util/MIDDUtils.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/util/MIDDUtils.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/midd/util/NodeUtils.java b/sne-xacml/src/main/java/nl/uva/sne/midd/util/NodeUtils.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/midd/util/NodeUtils.java
rename to sne-xacml/src/main/java/nl/uva/sne/midd/util/NodeUtils.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/AttributeMapper.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/AttributeMapper.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/AttributeMapper.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/AttributeMapper.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/ExternalNode3.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/ExternalNode3.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/ExternalNode3.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/ExternalNode3.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/PDP.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/PDP.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/PDP.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/PDP.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/PDPException.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/PDPException.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/PDPException.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/PDPException.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/builders/ResponseTypeBuilder.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/builders/ResponseTypeBuilder.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/builders/ResponseTypeBuilder.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/builders/ResponseTypeBuilder.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/PolicyRepository.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/PolicyRepository.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/PolicyRepository.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/PolicyRepository.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/PolicySetBuilder.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/PolicySetBuilder.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/PolicySetBuilder.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/PolicySetBuilder.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/finder/PolicyFinder.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/finder/PolicyFinder.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/finder/PolicyFinder.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/finder/PolicyFinder.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/finder/impl/PolicyFinderImpl.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/finder/impl/PolicyFinderImpl.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/finder/impl/PolicyFinderImpl.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/finder/impl/PolicyFinderImpl.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/AllOfExpression.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/AllOfExpression.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/AllOfExpression.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/AllOfExpression.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/AnyOfExpression.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/AnyOfExpression.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/AnyOfExpression.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/AnyOfExpression.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/AttributeInfo.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/AttributeInfo.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/AttributeInfo.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/AttributeInfo.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/MIDDParsingException.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/MIDDParsingException.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/MIDDParsingException.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/MIDDParsingException.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/PolicyParser.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/PolicyParser.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/PolicyParser.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/PolicyParser.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/PolicySetParser.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/PolicySetParser.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/PolicySetParser.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/PolicySetParser.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/RuleParser.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/RuleParser.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/RuleParser.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/RuleParser.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/TargetExpression.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/TargetExpression.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/TargetExpression.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/TargetExpression.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/XACMLParsingException.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/XACMLParsingException.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/XACMLParsingException.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/XACMLParsingException.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/AttributeConverter.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/AttributeConverter.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/AttributeConverter.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/AttributeConverter.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/CombiningAlgConverterUtil.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/CombiningAlgConverterUtil.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/CombiningAlgConverterUtil.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/CombiningAlgConverterUtil.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/DataTypeConverterUtil.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/DataTypeConverterUtil.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/DataTypeConverterUtil.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/DataTypeConverterUtil.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/DecisionConverterUtil.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/DecisionConverterUtil.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/DecisionConverterUtil.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/DecisionConverterUtil.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/MatchIdConverterUtil.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/MatchIdConverterUtil.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/policy/parsers/util/MatchIdConverterUtil.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/policy/parsers/util/MatchIdConverterUtil.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ActionType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ActionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ActionType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ActionType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/AttributeType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/AttributeType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/AttributeType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/AttributeType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/AttributeValueType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/AttributeValueType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/AttributeValueType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/AttributeValueType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/DecisionType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/DecisionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/DecisionType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/DecisionType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/EnvironmentType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/EnvironmentType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/EnvironmentType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/EnvironmentType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/MissingAttributeDetailType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/MissingAttributeDetailType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/MissingAttributeDetailType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/MissingAttributeDetailType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ObjectFactory.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ObjectFactory.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ObjectFactory.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ObjectFactory.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/RequestType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/RequestType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/RequestType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/RequestType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResourceContentType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResourceContentType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResourceContentType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResourceContentType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResourceType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResourceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResourceType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResourceType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResponseType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResponseType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResponseType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResponseType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResultType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResultType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResultType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/ResultType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusCodeType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusCodeType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusCodeType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusCodeType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusDetailType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusDetailType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusDetailType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusDetailType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/StatusType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/SubjectType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/SubjectType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/SubjectType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/SubjectType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/package-info.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/package-info.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/package-info.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/context/package-info.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionMatchType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionMatchType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionMatchType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionMatchType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionsType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionsType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ActionsType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ApplyType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ApplyType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ApplyType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ApplyType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeAssignmentType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeAssignmentType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeAssignmentType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeAssignmentType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeDesignatorType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeDesignatorType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeDesignatorType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeDesignatorType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeSelectorType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeSelectorType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeSelectorType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeSelectorType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeValueType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeValueType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeValueType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/AttributeValueType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/CombinerParameterType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/CombinerParameterType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/CombinerParameterType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/CombinerParameterType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/CombinerParametersType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/CombinerParametersType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/CombinerParametersType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/CombinerParametersType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ConditionType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ConditionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ConditionType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ConditionType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/DefaultsType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/DefaultsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/DefaultsType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/DefaultsType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EffectType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EffectType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EffectType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EffectType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentMatchType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentMatchType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentMatchType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentMatchType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentsType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentsType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/EnvironmentsType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ExpressionType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ExpressionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ExpressionType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ExpressionType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/FunctionType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/FunctionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/FunctionType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/FunctionType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/IdReferenceType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/IdReferenceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/IdReferenceType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/IdReferenceType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObjectFactory.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObjectFactory.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObjectFactory.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObjectFactory.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObligationType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObligationType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObligationType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObligationType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObligationsType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObligationsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObligationsType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ObligationsType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicyCombinerParametersType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicyCombinerParametersType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicyCombinerParametersType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicyCombinerParametersType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicySetCombinerParametersType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicySetCombinerParametersType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicySetCombinerParametersType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicySetCombinerParametersType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicySetType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicySetType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicySetType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicySetType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicyType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicyType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicyType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/PolicyType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourceMatchType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourceMatchType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourceMatchType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourceMatchType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourceType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourceType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourceType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourcesType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourcesType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourcesType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/ResourcesType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/RuleCombinerParametersType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/RuleCombinerParametersType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/RuleCombinerParametersType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/RuleCombinerParametersType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/RuleType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/RuleType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/RuleType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/RuleType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectAttributeDesignatorType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectAttributeDesignatorType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectAttributeDesignatorType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectAttributeDesignatorType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectMatchType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectMatchType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectMatchType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectMatchType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectsType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectsType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/SubjectsType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/TargetType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/TargetType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/TargetType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/TargetType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/VariableDefinitionType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/VariableDefinitionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/VariableDefinitionType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/VariableDefinitionType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/VariableReferenceType.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/VariableReferenceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/VariableReferenceType.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/VariableReferenceType.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/package-info.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/package-info.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/package-info.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/profiles/_2_0_/policy/package-info.java
diff --git a/sne-xacml-core/src/main/java/nl/uva/sne/xacml/util/XACMLUtil.java b/sne-xacml/src/main/java/nl/uva/sne/xacml/util/XACMLUtil.java
similarity index 100%
rename from sne-xacml-core/src/main/java/nl/uva/sne/xacml/util/XACMLUtil.java
rename to sne-xacml/src/main/java/nl/uva/sne/xacml/util/XACMLUtil.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceExpressionType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceExpressionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceExpressionType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceExpressionType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceExpressionsType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceExpressionsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceExpressionsType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceExpressionsType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AdviceType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AllOfType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AllOfType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AllOfType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AllOfType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AnyOfType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AnyOfType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AnyOfType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AnyOfType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ApplyType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ApplyType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ApplyType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ApplyType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AssociatedAdviceType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AssociatedAdviceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AssociatedAdviceType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AssociatedAdviceType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeAssignmentExpressionType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeAssignmentExpressionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeAssignmentExpressionType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeAssignmentExpressionType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeAssignmentType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeAssignmentType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeAssignmentType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeAssignmentType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeDesignatorType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeDesignatorType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeDesignatorType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeDesignatorType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeSelectorType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeSelectorType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeSelectorType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeSelectorType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeValueType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeValueType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeValueType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributeValueType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributesReferenceType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributesReferenceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributesReferenceType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributesReferenceType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributesType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributesType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributesType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/AttributesType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/CombinerParameterType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/CombinerParameterType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/CombinerParameterType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/CombinerParameterType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/CombinerParametersType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/CombinerParametersType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/CombinerParametersType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/CombinerParametersType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ConditionType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ConditionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ConditionType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ConditionType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ContentType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ContentType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ContentType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ContentType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/DecisionType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/DecisionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/DecisionType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/DecisionType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/DefaultsType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/DefaultsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/DefaultsType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/DefaultsType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/EffectType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/EffectType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/EffectType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/EffectType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ExpressionType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ExpressionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ExpressionType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ExpressionType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/FunctionType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/FunctionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/FunctionType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/FunctionType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/IdReferenceType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/IdReferenceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/IdReferenceType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/IdReferenceType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MatchType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MatchType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MatchType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MatchType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MissingAttributeDetailType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MissingAttributeDetailType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MissingAttributeDetailType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MissingAttributeDetailType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MultiRequestsType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MultiRequestsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MultiRequestsType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/MultiRequestsType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObjectFactory.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObjectFactory.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObjectFactory.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObjectFactory.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationExpressionType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationExpressionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationExpressionType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationExpressionType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationExpressionsType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationExpressionsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationExpressionsType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationExpressionsType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationsType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationsType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ObligationsType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyCombinerParametersType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyCombinerParametersType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyCombinerParametersType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyCombinerParametersType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyIdentifierListType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyIdentifierListType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyIdentifierListType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyIdentifierListType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyIssuerType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyIssuerType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyIssuerType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyIssuerType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicySetCombinerParametersType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicySetCombinerParametersType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicySetCombinerParametersType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicySetCombinerParametersType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicySetType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicySetType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicySetType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicySetType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/PolicyType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestDefaultsType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestDefaultsType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestDefaultsType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestDefaultsType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestReferenceType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestReferenceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestReferenceType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestReferenceType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RequestType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ResponseType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ResponseType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ResponseType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ResponseType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ResultType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ResultType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ResultType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/ResultType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RuleCombinerParametersType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RuleCombinerParametersType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RuleCombinerParametersType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RuleCombinerParametersType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RuleType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RuleType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RuleType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/RuleType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusCodeType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusCodeType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusCodeType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusCodeType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusDetailType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusDetailType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusDetailType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusDetailType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/StatusType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/TargetType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/TargetType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/TargetType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/TargetType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/VariableDefinitionType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/VariableDefinitionType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/VariableDefinitionType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/VariableDefinitionType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/VariableReferenceType.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/VariableReferenceType.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/VariableReferenceType.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/VariableReferenceType.java
diff --git a/sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/package-info.java b/sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/package-info.java
similarity index 100%
rename from sne-xacml-core/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/package-info.java
rename to sne-xacml/src/main/java/oasis/names/tc/xacml/_3_0/core/schema/wd_17/package-info.java
diff --git a/sne-xacml-core/src/main/resources/schema/xacml-core-v3-schema-wd-17.xsd b/sne-xacml/src/main/resources/schema/xacml-core-v3-schema-wd-17.xsd
similarity index 100%
rename from sne-xacml-core/src/main/resources/schema/xacml-core-v3-schema-wd-17.xsd
rename to sne-xacml/src/main/resources/schema/xacml-core-v3-schema-wd-17.xsd
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/midd/BuildMIDDTest.java b/sne-xacml/src/test/java/nl/uva/sne/midd/BuildMIDDTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/midd/BuildMIDDTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/midd/BuildMIDDTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/midd/IntervalUtilTest.java b/sne-xacml/src/test/java/nl/uva/sne/midd/IntervalUtilTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/midd/IntervalUtilTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/midd/IntervalUtilTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/midd/algorithms/FirstApplicableAlgTest.java b/sne-xacml/src/test/java/nl/uva/sne/midd/algorithms/FirstApplicableAlgTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/midd/algorithms/FirstApplicableAlgTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/midd/algorithms/FirstApplicableAlgTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/midd/intervals/EndPointTest.java b/sne-xacml/src/test/java/nl/uva/sne/midd/intervals/EndPointTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/midd/intervals/EndPointTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/midd/intervals/EndPointTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/midd/intervals/IntervalTest.java b/sne-xacml/src/test/java/nl/uva/sne/midd/intervals/IntervalTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/midd/intervals/IntervalTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/midd/intervals/IntervalTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/midd/intervals/PartitionTest.java b/sne-xacml/src/test/java/nl/uva/sne/midd/intervals/PartitionTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/midd/intervals/PartitionTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/midd/intervals/PartitionTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/midd/nodes/NodeCopyTest.java b/sne-xacml/src/test/java/nl/uva/sne/midd/nodes/NodeCopyTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/midd/nodes/NodeCopyTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/midd/nodes/NodeCopyTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/LoadPolicyTest.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/LoadPolicyTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/LoadPolicyTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/LoadPolicyTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/SavePolicyTest.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/SavePolicyTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/SavePolicyTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/SavePolicyTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/generator/RequestGenerator.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/generator/RequestGenerator.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/generator/RequestGenerator.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/generator/RequestGenerator.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/AllOfExpressionTest.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/AllOfExpressionTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/AllOfExpressionTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/AllOfExpressionTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/AnyOfExpressionTest.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/AnyOfExpressionTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/AnyOfExpressionTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/AnyOfExpressionTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/PolicyParserTest.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/PolicyParserTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/PolicyParserTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/PolicyParserTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/PolicySetParserTest.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/PolicySetParserTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/PolicySetParserTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/PolicySetParserTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/TargetExpressionTest.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/TargetExpressionTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/parsers/TargetExpressionTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/parsers/TargetExpressionTest.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/test/LoadPolicyTest2.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/test/LoadPolicyTest2.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/test/LoadPolicyTest2.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/test/LoadPolicyTest2.java
diff --git a/sne-xacml-core/src/test/java/nl/uva/sne/xacml/test/SavePolicyTest.java b/sne-xacml/src/test/java/nl/uva/sne/xacml/test/SavePolicyTest.java
similarity index 100%
rename from sne-xacml-core/src/test/java/nl/uva/sne/xacml/test/SavePolicyTest.java
rename to sne-xacml/src/test/java/nl/uva/sne/xacml/test/SavePolicyTest.java
diff --git a/sne-xacml-core/src/test/resources/PPS-VIO-Role.xml b/sne-xacml/src/test/resources/PPS-VIO-Role.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/PPS-VIO-Role.xml
rename to sne-xacml/src/test/resources/PPS-VIO-Role.xml
diff --git a/sne-xacml-core/src/test/resources/log4j.properties b/sne-xacml/src/test/resources/log4j.properties
similarity index 100%
rename from sne-xacml-core/src/test/resources/log4j.properties
rename to sne-xacml/src/test/resources/log4j.properties
diff --git a/sne-xacml-core/src/test/resources/policyset-number-po-request1.xml b/sne-xacml/src/test/resources/policyset-number-po-request1.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/policyset-number-po-request1.xml
rename to sne-xacml/src/test/resources/policyset-number-po-request1.xml
diff --git a/sne-xacml-core/src/test/resources/xacml2-sample-policy.xml b/sne-xacml/src/test/resources/xacml2-sample-policy.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml2-sample-policy.xml
rename to sne-xacml/src/test/resources/xacml2-sample-policy.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-AllOfExpressionTest.xml b/sne-xacml/src/test/resources/xacml3-AllOfExpressionTest.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-AllOfExpressionTest.xml
rename to sne-xacml/src/test/resources/xacml3-AllOfExpressionTest.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-AnyOf.xml b/sne-xacml/src/test/resources/xacml3-AnyOf.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-AnyOf.xml
rename to sne-xacml/src/test/resources/xacml3-AnyOf.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-multi-valued-attributes-policy.xml b/sne-xacml/src/test/resources/xacml3-multi-valued-attributes-policy.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-multi-valued-attributes-policy.xml
rename to sne-xacml/src/test/resources/xacml3-multi-valued-attributes-policy.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-null.xml b/sne-xacml/src/test/resources/xacml3-null.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-null.xml
rename to sne-xacml/src/test/resources/xacml3-null.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-policyset-number-po.xml b/sne-xacml/src/test/resources/xacml3-policyset-number-po.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-policyset-number-po.xml
rename to sne-xacml/src/test/resources/xacml3-policyset-number-po.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-policyset-sli.xml b/sne-xacml/src/test/resources/xacml3-policyset-sli.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-policyset-sli.xml
rename to sne-xacml/src/test/resources/xacml3-policyset-sli.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-policyset-suppliers.xml b/sne-xacml/src/test/resources/xacml3-policyset-suppliers.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-policyset-suppliers.xml
rename to sne-xacml/src/test/resources/xacml3-policyset-suppliers.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-ps-null1.xml b/sne-xacml/src/test/resources/xacml3-ps-null1.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-ps-null1.xml
rename to sne-xacml/src/test/resources/xacml3-ps-null1.xml
diff --git a/sne-xacml-core/src/test/resources/xacml3-sli-request.xml b/sne-xacml/src/test/resources/xacml3-sli-request.xml
similarity index 100%
rename from sne-xacml-core/src/test/resources/xacml3-sli-request.xml
rename to sne-xacml/src/test/resources/xacml3-sli-request.xml
diff --git a/sne-xacml-core/standards/access_control-xacml-2.0-context-schema-os.xsd b/sne-xacml/standards/access_control-xacml-2.0-context-schema-os.xsd
similarity index 100%
rename from sne-xacml-core/standards/access_control-xacml-2.0-context-schema-os.xsd
rename to sne-xacml/standards/access_control-xacml-2.0-context-schema-os.xsd
diff --git a/sne-xacml-core/standards/access_control-xacml-2.0-core-spec-os.pdf b/sne-xacml/standards/access_control-xacml-2.0-core-spec-os.pdf
similarity index 100%
rename from sne-xacml-core/standards/access_control-xacml-2.0-core-spec-os.pdf
rename to sne-xacml/standards/access_control-xacml-2.0-core-spec-os.pdf
diff --git a/sne-xacml-core/standards/access_control-xacml-2.0-policy-schema-os.xsd b/sne-xacml/standards/access_control-xacml-2.0-policy-schema-os.xsd
similarity index 100%
rename from sne-xacml-core/standards/access_control-xacml-2.0-policy-schema-os.xsd
rename to sne-xacml/standards/access_control-xacml-2.0-policy-schema-os.xsd
diff --git a/sne-xacml-core/standards/xacml-3.0-core-spec-os-en.pdf b/sne-xacml/standards/xacml-3.0-core-spec-os-en.pdf
similarity index 100%
rename from sne-xacml-core/standards/xacml-3.0-core-spec-os-en.pdf
rename to sne-xacml/standards/xacml-3.0-core-spec-os-en.pdf
diff --git a/sne-xacml-core/standards/xacml-core-v3-schema-wd-17.xsd b/sne-xacml/standards/xacml-core-v3-schema-wd-17.xsd
similarity index 100%
rename from sne-xacml-core/standards/xacml-core-v3-schema-wd-17.xsd
rename to sne-xacml/standards/xacml-core-v3-schema-wd-17.xsd