diff --git a/BetaProcedures.xsd b/BetaProcedures.xsd
index 00810f41..401ca8e7 100644
--- a/BetaProcedures.xsd
+++ b/BetaProcedures.xsd
@@ -5,23 +5,16 @@
     xmlns:witsml="http://www.energistics.org/energyml/data/witsmlv2"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:gml="http://www.opengis.net/gml/3.2"
-    targetNamespace="http://diggsml.org/schemas/2.6/geotechnical" elementFormDefault="qualified"
+    targetNamespace="http://diggsml.org/schemas/2.6" elementFormDefault="qualified"
     version="2.6" vc:maxVersion="1.1" vc:minVersion="1.0"
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning">
-    <!-- import the gml and xlinks namespaces (original local profiles) -->
-    <!--  (canonical complete schemas for TeamEngine GML validation) 
-	<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/XML/2008/06/xlink.xsd"/>
-	<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	-->
-    <!-- include and import other DIGGS schemas -->
-    <!-- import the witsml schemas -->
 
-    <import namespace="http://diggsml.org/schemas/2.6" schemaLocation="Diggs.xsd"/>
+    <import namespace="http://diggsml.org/schemas/2.6/geotechnical" schemaLocation="Diggs_geo.xsd"/>
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
         schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
-    <element name="AggregateAbrasionValueTest" type="diggs_geo:AggregateAbrasionValueTestType"
+    
+    <element name="AggregateAbrasionValueTest" type="diggs:AggregateAbrasionValueTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The Aggregate Abrasion Value is a measure of the resistance of aggregate to surface wear by abrasion.  In this test, two specimens are pressed against the surface of a steel disc rotating in a horizontal plane, with a force of 0.365 newtons per sq. centimetre. Sand, fed by hoppers, is used as an abrasive. After 500 disc revolutions the amount of material abraded is measured by calculation of the weight loss of the aggregate. The percentage loss in mass of chippings as known as the ‘Aggregate Abrasion Value’ (AAV), and ranges from about 1 for hard flints to over 16 for aggregates normally considered too soft for use in road surfacings.</documentation>
@@ -37,7 +30,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="AggregateSlakeDurabilityTest" type="diggs_geo:AggregateSlakeDurabilityTestType"
+    <element name="AggregateSlakeDurabilityTest" type="diggs:AggregateSlakeDurabilityTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>An object describing the properties of a slake durability test procedure. The Slake Durability Index predicts the long-term durability of the rock
@@ -107,7 +100,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="AggregateCrushingValueTest" type="diggs_geo:AggregateCrushingValueTestType"
+    <element name="AggregateCrushingValueTest" type="diggs:AggregateCrushingValueTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The Aggregate Crushing Value provides a relative measure of the resistance of an aggregate to crushing under a gradually applied compressive load, and is defined as the ratio of the weight of fines passing the specified sieve to the total weight of the sample expressed as a percentage.</documentation>
@@ -133,7 +126,7 @@
             <documentation>The Flakiness Index is defined as the percentage by weight of aggregate particles whose least dimension is less than 0.6 times their mean size.</documentation>
         </annotation>
     </element>
-    <element name="AggregateImpactValueTest" type="diggs_geo:AggregateImpactValueTestProcedureType"
+    <element name="AggregateImpactValueTest" type="diggs:AggregateImpactValueTestProcedureType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The Aggregate Impact Value represents the resistance to impact of aggregates. Aggregates passing 12.5 mm sieve and retained on 10 mm sieve is filled in a cylindrical steel cup of internal dia 10.2 mm and depth 5 cm which is attached to a metal base of impact testing machine. The material is filled in 3 layers where each layer is tamped for 25 number of blows. Metal hammer of weight 13.5 to 14 Kg is arranged to drop with a free fall of 38.0 cm by vertical guides and the test specimen is subjected to 15 number of blows. The crushed aggregate is allowed to pass through the 2.36 sieve. And the impact value is measured as percentage of aggregates passing to the total weight of the sample.</documentation>
@@ -167,7 +160,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="LosAngelesAbrasionTest" type="diggs_geo:LosAngelesAbrasionTestType"
+    <element name="LosAngelesAbrasionTest" type="diggs:LosAngelesAbrasionTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The Los Angeles Abrasion test is used to indicate aggregate toughness and abrasion characteristics.  The test subjects a coarse aggregate sample to abrasion, impact, and grinding in a rotating steel drum containing a specified number of steel spheres.  After being subjected to the rotating drum, the weight of aggregate that is retained on a specified sieve is subtracted from the original weight to obtain a percentage of the total aggregate weight that has broken down and passed through. Therefore, an L.A. abrasion loss value of 40 indicates that 40% of the original sample passed through.</documentation>
@@ -207,7 +200,7 @@
             <documentation>Used to determine the in-place density and unit weight of soils using a sand cone apparatus.</documentation>
         </annotation>
     </element>
-    <element name="ChalkCrushingValueTest" type="diggs_geo:ChalkCrushingValueTestProcedureType"
+    <element name="ChalkCrushingValueTest" type="diggs:ChalkCrushingValueTestProcedureType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The Chalk Crushing Value is determined by using the chalk impact crushing test, which measures the rate at which a sample of chalk lumps crushes under impacts from a freefalling rammer. The chalk crushing value can be used, together with the saturation moisture content of the intact chalk lumps, to classify chalk in relation to its behaviour as a freshly placed fill material. The test procedure is described for a single sample of chalk lumps, but normal procedure should be to calculate the mean value derived from six such tests on representative samples.</documentation>
@@ -229,7 +222,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="PressuremeterTest" type="diggs_geo:PressuremeterTestProcedureType"
+    <element name="PressuremeterTest" type="diggs:PressuremeterTestProcedureType"
         abstract="false" substitutionGroup="diggs:AbstractInsituTestProcedure">
         <annotation>
             <documentation>The Pressuremeter measures both the strength and stress-strain properties of all soil types including soft rock. The pressuremeter is used primarily to calculate bearing capacity of shallow and deep foundations; settlement of foundations; deformation of laterally loaded and sheet piles and resistance of anchors</documentation>
@@ -252,13 +245,13 @@
                             <documentation>The uninflated diameter of the pressuremeter.</documentation>
                         </annotation>
                     </element>
-                    <element name="trial" type="diggs_geo:PressuremeterTestTrialPropertyType"
+                    <element name="trial" type="diggs:PressuremeterTestTrialPropertyType"
                         minOccurs="0" maxOccurs="unbounded"/>
                 </sequence>
             </extension>
         </complexContent>
     </complexType>
-    <element name="PressuremeterTestTrial" type="diggs_geo:PressuremeterTestTrialType"
+    <element name="PressuremeterTestTrial" type="diggs:PressuremeterTestTrialType"
         abstract="false" substitutionGroup="diggs:AbstractObject">
         <annotation>
             <documentation>Results for each trial in PressuremeterTest</documentation>
@@ -269,7 +262,7 @@
             <documentation>Property for PressuremeterTestTrials, required parent element that holds the multiple trials.</documentation>
         </annotation>
         <sequence>
-            <element ref="diggs_geo:PressuremeterTestTrial" minOccurs="1" maxOccurs="1"/>
+            <element ref="diggs:PressuremeterTestTrial" minOccurs="1" maxOccurs="1"/>
         </sequence>
     </complexType>
     <complexType name="PressuremeterTestTrialType">
@@ -318,7 +311,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="InsituPermeabilityTest" type="diggs_geo:InsituPermeabilityTestType"
+    <element name="InsituPermeabilityTest" type="diggs:InsituPermeabilityTestType"
         abstract="false" substitutionGroup="diggs:AbstractInsituTestProcedure">
         <annotation>
             <documentation>This test determines the insitu permeability of a soil based on constant head, falling head, and packer test methods.</documentation>
@@ -386,7 +379,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="PumpingTest" type="diggs_geo:PumpingTestType" abstract="false"
+    <element name="PumpingTest" type="diggs:PumpingTestType" abstract="false"
         substitutionGroup="diggs:AbstractInsituTestProcedure">
         <annotation>
             <documentation>An aquifer test (or a pumping test) is conducted to evaluate an aquifer by "stimulating" the aquifer through constant pumping, and observing the aquifer's "response" (drawdown) in observation wells.</documentation>
@@ -399,13 +392,13 @@
         <complexContent>
             <extension base="diggs:AbstractInsituTestProcedureType">
                 <sequence>
-                    <element name="reading" type="diggs_geo:PumpingTestReadingPropertyType"
+                    <element name="reading" type="diggs:PumpingTestReadingPropertyType"
                         minOccurs="0" maxOccurs="unbounded"/>
                 </sequence>
             </extension>
         </complexContent>
     </complexType>
-    <element name="PumpingTestReading" type="diggs_geo:PumpingTestReadingType" abstract="false"
+    <element name="PumpingTestReading" type="diggs:PumpingTestReadingType" abstract="false"
         substitutionGroup="diggs:AbstractObject">
         <annotation>
             <documentation>Results for each trial in PumpingTest</documentation>
@@ -416,7 +409,7 @@
             <documentation>Property for PumpingTestTrials, required parent element that holds the multiple trials.</documentation>
         </annotation>
         <sequence>
-            <element ref="diggs_geo:PumpingTestReading" minOccurs="1" maxOccurs="1"/>
+            <element ref="diggs:PumpingTestReading" minOccurs="1" maxOccurs="1"/>
         </sequence>
     </complexType>
     <complexType name="PumpingTestReadingType">
@@ -450,7 +443,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="InSituPenetrometerTest" type="diggs_geo:InSituPenetrometerTestType"
+    <element name="InSituPenetrometerTest" type="diggs:InSituPenetrometerTestType"
         abstract="false" substitutionGroup="diggs:AbstractInsituTestProcedure">
         <annotation>
             <documentation>This test provides an estimate of undrained shear strength.</documentation>
@@ -483,7 +476,7 @@
             <documentation>This test provides an estimate of undrained shear strength.</documentation>
         </annotation>
     </element>
-    <element name="FrostSusceptibilityTest" type="diggs_geo:FrostSusceptibilityTestType"
+    <element name="FrostSusceptibilityTest" type="diggs:FrostSusceptibilityTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>Test establishes the degree of frost-susceptibility of unbound sub-base and base materials for pavements.</documentation>
@@ -526,7 +519,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="RelativeDensityTest" type="diggs_geo:RelativeDensityTestType" abstract="false"
+    <element name="RelativeDensityTest" type="diggs:RelativeDensityTestType" abstract="false"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The relative density of a soil is the ratio, expressed as a percentage, of the difference between the maximum index void ratio and the field void ratio of a cohesionless, free-draining soil; to the difference between its maximum and minimum index void ratios.</documentation>
@@ -555,7 +548,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="RockPorosityDensityTest" type="diggs_geo:RockPorosityDensityTestType"
+    <element name="RockPorosityDensityTest" type="diggs:RockPorosityDensityTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>This test determines the porosity and density of rock.</documentation>
@@ -606,7 +599,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="SchmidtReboundHardnessTest" type="diggs_geo:SchmidtReboundHardnessTestType"
+    <element name="SchmidtReboundHardnessTest" type="diggs:SchmidtReboundHardnessTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The Schmidt Hardness Test utilizes a hammer mass launched against an impact plunger. The amount of hammer mass rebound depends on the hardness of the test piece. This rebound amount is then shown on a scale of 10 to 100.</documentation>
@@ -673,7 +666,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="AggregateTenPercentFinesTest" type="diggs_geo:AggregateTenPercentFinesTestType"
+    <element name="AggregateTenPercentFinesTest" type="diggs:AggregateTenPercentFinesTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>Test produces a Ten Percent Fines Value (TFV) for aggregate testing.</documentation>
@@ -700,7 +693,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="AggregateSoundnessTest" type="diggs_geo:AggregateSoundnessTestType"
+    <element name="AggregateSoundnessTest" type="diggs:AggregateSoundnessTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The Aggregate Soundness test is intended to study the resistance of aggregates to weathering action, by conducting accelerated weathering test cycles. The Porous aggregates subjected to freezing and thawing are likely to disintegrate prematurely. To ascertain the durability of such aggregates, they are subjected to cycles of alternate wetting in a saturated solution of either sodium sulphate or magnesium sulphate for 16 - 18 hours and then dried in oven at  to a constant weight. After five cycles, the loss in weight of aggregates is determined by sieving out all undersized particles and weighing.</documentation>
@@ -714,7 +707,7 @@
             <extension base="diggs:AbstractLaboratoryTestProcedureType"> </extension>
         </complexContent>
     </complexType>
-    <element name="CationExchangeTest" type="diggs_geo:CationExchangeTestType" abstract="false"
+    <element name="CationExchangeTest" type="diggs:CationExchangeTestType" abstract="false"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>Cation-exchange capacity is defined as the degree to which a soil can adsorb and exchange cations.</documentation>
@@ -749,7 +742,7 @@
             <documentation>This test determines the insitu resistivity of a soil.</documentation>
         </annotation>
     </element>
-    <element name="LabVelocityTest" type="diggs_geo:LabVelocityTestType" abstract="false"
+    <element name="LabVelocityTest" type="diggs:LabVelocityTestType" abstract="false"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>Shear wave velocity can be measured in the laboratory using resonant column tests, bender elements, ultrasonics, torsional shear tests, and modified triaxial tests. </documentation>
@@ -771,7 +764,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="MCVTest" type="diggs_geo:MCVTestType" abstract="false"
+    <element name="MCVTest" type="diggs:MCVTestType" abstract="false"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>The Moisture Condition Value (MCV) is determined from a moisture condition test, a physical test indicating how much compactive effort is needed to compact a sample of soil at a particular moisture content.  Compactive effort is provided by dropping a captive  weight vertically a known distance on to a sample of soil in a cylindrical mould, and measuring compaction. By counting blows to give the required compaction it will be possible to establish a MCV for a soil at a particular moisture content.</documentation>
@@ -790,13 +783,13 @@
                             <documentation>Natural moisture content of specimen prior to test.</documentation>
                         </annotation>
                     </element>
-                    <element name="trial" type="diggs_geo:MCVTestTrialPropertyType" minOccurs="0"
+                    <element name="trial" type="diggs:MCVTestTrialPropertyType" minOccurs="0"
                         maxOccurs="unbounded"/>
                 </sequence>
             </extension>
         </complexContent>
     </complexType>
-    <element name="MCVTestTrial" type="diggs_geo:MCVTestTrialType" abstract="false"
+    <element name="MCVTestTrial" type="diggs:MCVTestTrialType" abstract="false"
         substitutionGroup="diggs:AbstractObject">
         <annotation>
             <documentation>Results for each trial in MCVTest</documentation>
@@ -807,7 +800,7 @@
             <documentation>Property for MCVTestTrials, required parent element that holds the multiple trials.</documentation>
         </annotation>
         <sequence>
-            <element ref="diggs_geo:MCVTestTrial" minOccurs="1" maxOccurs="1"/>
+            <element ref="diggs:MCVTestTrial" minOccurs="1" maxOccurs="1"/>
         </sequence>
     </complexType>
     <complexType name="MCVTestTrialType">
@@ -857,7 +850,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="MicroDevalTest" type="diggs_geo:MicroDevalTestType" abstract="false"
+    <element name="MicroDevalTest" type="diggs:MicroDevalTestType" abstract="false"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation/>
@@ -884,7 +877,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="LinearShrinkageTest" type="diggs_geo:LinearShrinkageTestType" abstract="false"
+    <element name="LinearShrinkageTest" type="diggs:LinearShrinkageTestType" abstract="false"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure">
         <annotation>
             <documentation>Linear shrinkage is the decrease in length of a soil sample when oven-dried, starting with a moisture content of the sample at the liquid limit.</documentation>
diff --git a/Construction.xsd b/Construction.xsd
index 6b6852bb..cb804757 100644
--- a/Construction.xsd
+++ b/Construction.xsd
@@ -10,10 +10,6 @@
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
     targetNamespace="http://diggsml.org/schemas/2.6" version="2.6" elementFormDefault="qualified"
     vc:maxVersion="1.1" vc:minVersion="1.0">
-    <!--
- import the gml and xlinks namespaces (original local profiles)  
--->
-
 
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://diggsml.org/schemas/2.6/geotechnical" schemaLocation="Diggs_geo.xsd"/>
diff --git a/Diggs.xsd b/Diggs.xsd
index 6af7f866..a40dbfb6 100644
--- a/Diggs.xsd
+++ b/Diggs.xsd
@@ -26,5 +26,6 @@
   <include schemaLocation="Construction.xsd"/>
   <include schemaLocation="Geophysics.xsd"/>
   <include schemaLocation="TestProceduresAll.xsd"/>
+  <include schemaLocation="BetaProcedures.xsd"/>
   <import namespace="http://diggsml.org/schemas/2.6/geotechnical" schemaLocation="Diggs_geo.xsd"/>
 </schema>
diff --git a/Diggs_geo.xsd b/Diggs_geo.xsd
index 96385581..d94ccf72 100644
--- a/Diggs_geo.xsd
+++ b/Diggs_geo.xsd
@@ -12,6 +12,5 @@
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning">
     <!-- include and import other diggs:geo schemas -->
     <include schemaLocation="Geotechnical.xsd"/>
-    <include schemaLocation="BetaProcedures.xsd"/>
     <include schemaLocation="Diggs_geo_deprecated.xsd"/>
 </schema>