Moved Drilling and Well project

@@ -64,10 +64,10 @@
 .
 :ActivityConstraint
   rdf:type owl:Class ;
+  :shouldHaveID "true"^^xsd:boolean ;
   rdfs:comment "A Constraint in Plan where 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 ;
-  :shouldHaveID "true"^^xsd:boolean ;
   rdfs:subClassOf [
       rdf:type owl:Class ;
       owl:unionOf (
@@ -131,9 +131,9 @@
 :ActivityInPlan
   rdf:type :ClassOfClassOfActivity ;
   rdf:type owl:Class ;
+  :shouldHaveID "true"^^xsd:boolean ;
   rdfs:comment "An Plan of Activity that has its role within a larger PlanForActivity as a criterion for membership. An ActivityInPlan is part of a PlanForActivity, with defined Constraints, Duration, Schedule Dates, Resources and Results."^^xsd:string ;
   rdfs:label "Activity in Plan"^^xsd:string ;
-  :shouldHaveID "true"^^xsd:boolean ;
   rdfs:subClassOf :PlanForActivity ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
@@ -1158,8 +1158,9 @@
 .
 :DrillingAndWellProject
   rdf:type :ProjectType ;
-  rdfs:label "A DrillingActivity that is a drilling and well project"^^xsd:string ;
-  rdfs:subClassOf :DrillingActivity ;
+  rdfs:comment "A DrillingActivity that is a drilling and well project."^^xsd:string ;
+  rdfs:label "Drilling and Well Project"^^xsd:string ;
+  rdfs:subClassOf :Project ;
 .
 :DrillingPlan
   rdf:type owl:Class ;
@@ -1256,17 +1257,15 @@
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:onDataRange xsd:string ;
-      owl:onProperty :hasID ;
+      owl:onProperty :hasApplication ;
       owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
     ] ;
-rdfs:subClassOf [
+  rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:onDataRange xsd:string ;
-      owl:onProperty :hasApplication ;
+      owl:onProperty :hasID ;
       owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
     ] ;
-
-  
 .
 :FF
   rdf:type owl:Class ;
@@ -1887,7 +1886,7 @@ rdfs:subClassOf [
 .
 :ModificationProject
   rdf:type :ProjectType ;
-  rdfs:comment "A Project which involves modification of asn Asset."^^xsd:string ;
+  rdfs:comment "A Project which involves modification of an Asset."^^xsd:string ;
   rdfs:label "Modification Project"^^xsd:string ;
   rdfs:subClassOf :Project ;
 .
@@ -1931,7 +1930,7 @@ rdfs:subClassOf [
 :OperationAndMaintenanceProject
   rdf:type :ProjectType ;
   rdfs:comment "A Project which involves operation and maintenance of an Asset."^^xsd:string ;
-  rdfs:label "Operation and maintenance project"^^xsd:string ;
+  rdfs:label "Operation and Maintenance Project"^^xsd:string ;
   rdfs:subClassOf :Project ;
 .
 :OperationInPlan
@@ -2075,12 +2074,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ExternalReference ;
-      owl:onProperty :hasExternalReference ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
       :shouldBeInternalAndExternalRef "true"^^xsd:boolean ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :PlanForILAP ;
@@ -2170,6 +2163,12 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ExternalReference ;
+      owl:onProperty :hasExternalReference ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :MilestoneInPlan ;
       owl:onProperty :hasMilestone ;
     ] ;
@@ -2407,10 +2406,10 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
 .
 :Project
   rdf:type owl:Class ;
+  :shouldHaveID "true" ;
   rdfs:comment "An Activity that is a temporary endeavor (in contrast with ongoing operations) with a defined beginning and end, constrained by available time, funding and resources, undertaken to achieve an objective conforming to specific requirements, meet unique objectives, and bring about beneficial change or added value (adapted from BSI and Wikipedia)."^^xsd:string ;
   rdfs:label "Project"^^xsd:string ;
   rdfs:subClassOf :Activity ;
-  :shouldHaveID "true" ;
   rdfs:subClassOf <http://data.posccaesar.org/rdl/RDS3149> ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;