Corrected ActivityConstraint

@@ -54,6 +54,40 @@
   rdfs:comment "A Constraint in which an Activity or Milestone is linked to other Activities (or Milestones) that must be performed (completely or partially) before it can be performed."^^xsd:string ;
   rdfs:label "Activity constraint"^^xsd:string ;
   rdfs:subClassOf :ConstraintInPlan ;
+  rdfs:subClassOf [
+      rdf:type owl:Class ;
+      owl:unionOf (
+          :FF
+          :FS
+          :SF
+          :SS
+        ) ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      :shouldUseRef "true"^^xsd:boolean ;
+      owl:onClass :ActivityInPlan ;
+      owl:onProperty :hasSuccessor ;
+      owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+      owl:onClass :Calendar ;
+      owl:onProperty :hasCalendar ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+      owl:onDataRange xsd:duration ;
+      owl:onProperty :hasLag ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ExternalReference ;
+      owl:onProperty :hasExternalReference ;
+    ] ;
 .
 :ActivityCriticality
   rdf:type owl:Class ;
@@ -201,6 +235,12 @@
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :ActivityConstraint ;
+      owl:onProperty :hasConstraint ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ActivityConstraint ;
       owl:onProperty :hasSuccessor ;
     ] ;
   rdfs:subClassOf [
@@ -236,12 +276,6 @@
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ConstraintInPlan ;
-      owl:onProperty :hasConstraint ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :ExternalReference ;
       owl:onProperty :hasExternalReference ;
     ] ;
@@ -822,41 +856,6 @@
   rdfs:comment "A Regulation that defines limitation or restrictions on relationships between Possible Individuals (adapted from ISO 15926 and Dictionary.com)."^^xsd:string ;
   rdfs:label "Constraint in Plan"^^xsd:string ;
   rdfs:subClassOf :ClassOfPeriodInTime ;
-  rdfs:subClassOf [
-      rdf:type owl:Class ;
-      owl:unionOf (
-          :FF
-          :FS
-          :SF
-          :SS
-        ) ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      :shouldUseRef "true"^^xsd:boolean ;
-      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-      owl:onClass :Calendar ;
-      owl:onProperty :hasCalendar ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      :shouldUseRef "true"^^xsd:boolean ;
-      owl:onClass :ActivityInPlan ;
-      owl:onProperty :hasSuccessor ;
-      owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-      owl:onDataRange xsd:duration ;
-      owl:onProperty :hasLag ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ExternalReference ;
-      owl:onProperty :hasExternalReference ;
-    ] ;
 .
 :Continent
   rdf:type owl:Class ;