diff --git a/v1_0_0/CDT-AE-v1_0_0.xsd b/v1_0_0/CDT-AE-v1_0_0.xsd
deleted file mode 100644
index 6ea8a96ca45799070ec675e6077aa08b414398a7..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-AE-v1_0_0.xsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_0_0.xsd" />
-
-	<xs:element name="AE">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="appName" type="xs:string" minOccurs="0" />
-						<xs:element name="App-ID" type="xs:string" />
-						<xs:element name="AE-ID" type="m2m:ID" />
-						<xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:group" />
-								<xs:element ref="m2m:accessControlPolicy" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:pollingChannel" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="AEAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="appName" type="xs:string" minOccurs="0" />
-						<xs:element name="App-ID" type="xs:string" />
-						<xs:element name="AE-ID" type="m2m:ID" />
-						<xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:containerAnnc" />
-								<xs:element ref="m2m:group" />
-								<xs:element ref="m2m:groupAnnc" />
-								<xs:element ref="m2m:accessControlPolicy" />
-								<xs:element ref="m2m:accessControlPolicyAnnc" />
-								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:pollingChannel" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-CSEBase-v1_0_0.xsd b/v1_0_0/CDT-CSEBase-v1_0_0.xsd
deleted file mode 100644
index 57dd306d2708d5cd5641518e5fc757d2a02c5008..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-CSEBase-v1_0_0.xsd
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-remoteCSE-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-AE-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-mgmtCmd-v1_0_0.xsd" />  
-    <xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsConfig-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-statsCollect-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-request-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-delivery-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd" />
-    <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v1_0_0.xsd" />
-
-	<xs:element name="CSEBase">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit just the universal resource attributes -->
-				<xs:extension base="m2m:resource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
-						<xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" />
-						<xs:element name="CSE-ID" type="m2m:ID" />
-						<xs:element name="supportedResourceType">
-							<xs:simpleType>
-								<xs:list itemType="m2m:resourceType" />
-							</xs:simpleType>
-						</xs:element>
-						<xs:element name="pointOfAccess" type="m2m:pOAList" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-				
-                        <!-- Child Resources -->
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element ref="m2m:remoteCSE" />
-                                <xs:element ref="m2m:node" />
-                                <xs:element ref="m2m:AE" />
-                                <xs:element ref="m2m:container" />
-                                <xs:element ref="m2m:group" />
-                                <xs:element ref="m2m:accessControlPolicy" />
-                                <xs:element ref="m2m:subscription" />
-                                <xs:element ref="m2m:mgmtCmd" />
-                                <xs:element ref="m2m:locationPolicy" />
-                                <xs:element ref="m2m:statsConfig" />
-                                <xs:element ref="m2m:statsCollect" />
-                                <xs:element ref="m2m:request" />
-                                <xs:element ref="m2m:delivery" />
-                                <xs:element ref="m2m:schedule" />
-                                <xs:element ref="m2m:m2mServiceSubscriptionProfile" />
-                                <xs:element ref="m2m:serviceSubscribedAppRule" />
-                            </xs:choice>
-                        </xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-accessControlPolicy-v1_0_0.xsd b/v1_0_0/CDT-accessControlPolicy-v1_0_0.xsd
deleted file mode 100644
index 41d5cec097add1d3764e0ba6019804ed2f7e3edf..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-accessControlPolicy-v1_0_0.xsd
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="unqualified">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd"/>
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd"/>
-
-	<xs:element name="accessControlPolicy">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Announceable Attributes from announceableSubordinateResource type -->
-				<xs:extension base="m2m:announceableSubordinateResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="privileges" type="m2m:setOfAcrs"/>
-						<xs:element name="selfPrivileges" type="m2m:setOfAcrs"/>
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef"
-								maxOccurs="unbounded"/>
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="accessControlPolicyAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Announceable Attributes from announceableSubordinateResource type -->
-				<xs:extension base="m2m:announcedSubordinateResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="privileges" type="m2m:setOfAcrs"/>
-						<xs:element name="selfPrivileges" type="m2m:setOfAcrs"/>
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef"
-								maxOccurs="unbounded"/>
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-
-	<!-- TODO: define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting)   -->
-
-	<xs:complexType name="setOfAcrs">
-		<xs:sequence>
-			<xs:element name="accessControlRule" type="m2m:accessControlRule" minOccurs="0"
-				maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="accessControlRule">
-		<xs:sequence>
-			<xs:element name="accessControlOriginators" type="m2m:listOfURIs" />
-
-			<!-- accessControlOperations defined as enumerated list 1 ... 63 -->
-			<xs:element name="accessControlOperations" type="m2m:accessControlOperations" />
-
-			<!-- TODO: mismatch with TS-0004 where "accessControlContexts" has multiplicity 0..1 -->
-			<xs:element name="accessControlContexts" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<!-- TODO: mismatch with TS-0003 where element is called "accessControlTimeWindows" -->
-						<!-- TODO: mismatch with TS-0001 where element is called "accessControlTimeWindow" -->
-						<xs:element name="accessControlWindow" type="m2m:scheduleEntry" minOccurs="0" maxOccurs="unbounded" />
-
-						<!-- TODO: mismatch with TS-0001: element is called accessControlIpAddress in TS-0001" in TS-0003 -->
-						<xs:element name="accessControlIpAddresses" minOccurs="0">
-							<xs:complexType>
-								<xs:sequence>
-									<!-- TODO: it should be possible to include both IPv6 and IPv4 address. Present text in TS-0004 is ambiguous. Not 
-										clear if "or" in TS-0001 is inclusive or exclusive. Below it is interpreted as inclusive. -->
-									<!-- TODO: the element names ipv4Addresses and ipv6Addresses are not explicitly mentioned in TS-0004 -->
-
-									<xs:element name="ipv4Addresses" minOccurs="0" maxOccurs="1">
-										<!-- space separated list of IPv4 addresses -->
-										<xs:simpleType>
-											<xs:list itemType="m2m:ipv4" />
-										</xs:simpleType>
-									</xs:element>
-									<xs:element name="ipv6Addresses" minOccurs="0" maxOccurs="1">
-										<!-- space separated list of IPv6 addresses -->
-										<xs:simpleType>
-											<xs:list itemType="m2m:ipv6" />
-										</xs:simpleType>
-									</xs:element>
-								</xs:sequence>
-							</xs:complexType>
-						</xs:element>
-
-						<!-- TODO: mismatch with TS-0003 and TS-0004 where element is called "accessControlLocationRegions" -->
-						<!-- TODO: mismatch with TS-0004 where element has multiplicity [0..n] -->
-						<xs:element name="accessControlLocationRegion" type="m2m:locationRegion" minOccurs="0" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="locationRegion">
-		<xs:choice>
-			<xs:element name="countryCode">
-				<!-- Space separated list of 2-digit country codes -->
-				<xs:simpleType>
-					<xs:list itemType="m2m:countryCode" />
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="circRegion">
-				<!-- "circularRegion" is an ordered list of following three parameters of data type float ´ 1) longitude in the range 
-					+/-180 degrees 2) latitude in the range +/-90 degrees, 3) radius in meters -->
-				<xs:simpleType>
-					<xs:restriction>
-						<xs:simpleType>
-							<xs:list itemType="xs:float" />
-						</xs:simpleType>
-						<xs:minLength value="3" />
-						<xs:maxLength value="3" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-		</xs:choice>
-	</xs:complexType>
-
-	<!-- countryCode as defined in TS-0004 -->
-	<xs:simpleType name="countryCode">
-		<xs:annotation>
-			<xs:documentation>2-character country code as defined by ISO-3166</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[A-Z]{2}" />
-		</xs:restriction>
-	</xs:simpleType>
-
-
-	<!-- Initial IPv4 and IPv6 address representation types were found here:
-     http://lists.w3.org/Archives/Public/www-xml-schema-comments/2005OctDec/0138.html, CIDR suffix has been added  -->
-
-	<!--  TODO: Need to add more descriptive text into TS-0004 about structure of IPv4 and IPv6 addresses with optional CIDR suffix -->
-	<xs:simpleType name="ipv4">
-		<xs:annotation>
-			<xs:documentation> An IP version 4 address, with optional CIDR suffix in the range /0
-				... /32. </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:pattern
-				value="(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])(/([0-9]|[1-2][0-9]|3[0-2]))?"/>
-			<xs:pattern value="[0-9A-Fa-f]{8}(/([0-9]|[1-2][0-9]|3[0-2]))?"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="ipv6">
-		<xs:annotation>
-			<xs:documentation> An IP version 6 address, based on RFC 1884, with optional CIDR suffix
-				in the range /0 ... /128. </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<!-- Fully specified address -->
-			<xs:pattern
-				value="[0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){7}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<!-- Double colon start -->
-			<xs:pattern value=":(:[0-9A-Fa-f]{1,4}){1,7}"/>
-			<!-- Double colon middle -->
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,6}(:[0-9A-Fa-f]{1,4}){1}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,5}(:[0-9A-Fa-f]{1,4}){1,2}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,4}(:[0-9A-Fa-f]{1,4}){1,3}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,3}(:[0-9A-Fa-f]{1,4}){1,4}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1,2}(:[0-9A-Fa-f]{1,4}){1,5}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<xs:pattern
-				value="([0-9A-Fa-f]{1,4}:){1}(:[0-9A-Fa-f]{1,4}){1,6}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<!-- Double colon end -->
-			<xs:pattern value="([0-9A-Fa-f]{1,4}:){1,7}:(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
-			<!-- Embedded IPv4 addresses without CIDR suffix. Should IPv4 CIDR suffix be added?-->
-			<xs:pattern
-				value="((:(:0{1,4}){0,3}(:(0{1,4}|[fF]{4}))?)|(0{1,4}:(:0{1,4}){0,2}(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){2}(:0{1,4})?(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){3}(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){4}(0{1,4}|[fF]{4})?)):(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])"/>
-			<!-- The unspecified address -->
-			<xs:pattern value="::(/0)?"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-</xs:schema>
diff --git a/v1_0_0/CDT-activeCmdhPolicy-v1_0_0.xsd b/v1_0_0/CDT-activeCmdhPolicy-v1_0_0.xsd
deleted file mode 100644
index a1a86e438cb99aa4fdf9c4d145914e52e9afade7..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-activeCmdhPolicy-v1_0_0.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-
-    <xs:element name="activeCmdhPolicy">
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from regularResourceType  -->
-          <xs:extension base="m2m:mgmtResource">
-	           <xs:sequence>
-              <!-- Resource Specific Attributes -->
-	            <xs:element name="activeCmdhPolicyLink" type="m2m:ID" />	
-            </xs:sequence>
-          </xs:extension>  
-        </xs:complexContent> 	       
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
diff --git a/v1_0_0/CDT-areaNwkDeviceInfo-v1_0_0.xsd b/v1_0_0/CDT-areaNwkDeviceInfo-v1_0_0.xsd
deleted file mode 100644
index 8588d3746d270ad8de39160715e754f6136138c2..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-areaNwkDeviceInfo-v1_0_0.xsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"  
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
-	
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="areaNwkDeviceInfo">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from mgmtResource -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="devID" type="xs:string" />
-						<xs:element name="devType" type="xs:string" />
-						<xs:element name="areaNwkId" type="xs:anyURI" />
-						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="status" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" />
-		     
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="areaNwkDeviceInfoAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from announcedMgmtResource -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="devID" type="xs:string" minOccurs="0" />
-						<xs:element name="devType" type="xs:string" minOccurs="0" />
-						<xs:element name="areaNwkId" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="status" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" minOccurs="0" />
-		     
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-areaNwkInfo-v1_0_0.xsd b/v1_0_0/CDT-areaNwkInfo-v1_0_0.xsd
deleted file mode 100644
index 4026302b51a08020435b62caf20550a560d79c79..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-areaNwkInfo-v1_0_0.xsd
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"  
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">	
-	
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="areaNwkInfo">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from mgmtResource -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="areaNwkType" type="xs:string" />
-						<xs:element name="listOfDevices" type="m2m:listOfURIs" />
-		    
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="areaNwkInfoAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from announcedMgmtResource -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="areaNwkType" type="xs:string" minOccurs="0" />
-						<xs:element name="listOfDevices" type="m2m:listOfURIs" minOccurs="0" />
-		    
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-battery-v1_0_0.xsd b/v1_0_0/CDT-battery-v1_0_0.xsd
deleted file mode 100644
index 811c31ace0636885b41ee96b1ff8a65c89f7a719..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-battery-v1_0_0.xsd
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="battery">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="batteryLevel" type="xs:unsignedInt"/>
-						<xs:element name="batteryStatus" type="m2m:batteryStatus" />
-		
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="batteryAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="batteryLevel" type="xs:unsignedInt" minOccurs="0" />
-						<xs:element name="batteryStatus" type="m2m:batteryStatus" minOccurs="0" />
-		
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />   
-						</xs:choice>             
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-cmdhBuffer-v1_0_0.xsd b/v1_0_0/CDT-cmdhBuffer-v1_0_0.xsd
deleted file mode 100644
index e8dca6e5b56f55ede93f61b2eb62a316ce8a3ada..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-cmdhBuffer-v1_0_0.xsd
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-  
-  <xs:element name="cmdhBuffer">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes --> 
-            <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
-            <xs:element name="maxBufferSize" type="xs:nonNegativeInteger" />  <!-- unit in bytes -->
-            <xs:element name="storagePriority">
-               <xs:simpleType>
-                 <xs:restriction base="xs:positiveInteger">
-                   <xs:maxExclusive value="11"/>
-                 </xs:restriction>
-               </xs:simpleType>
-            </xs:element>       
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
-
diff --git a/v1_0_0/CDT-cmdhDefEcValue-v1_0_0.xsd b/v1_0_0/CDT-cmdhDefEcValue-v1_0_0.xsd
deleted file mode 100644
index ff3316f129c5ea3d76895a198278f994adb90dc1..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-cmdhDefEcValue-v1_0_0.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-  
-  <xs:element name="cmdhDefEcValue">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="order" type="xs:positiveInteger" />
-            <xs:element name="defEcValue" type="m2m:eventCat" />
-            <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
-            <xs:element name="requestContext" type="xs:anyType" minOccurs="0" />
-            <xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" />
-            <xs:element name="requestCharacteristics" type="xs:anyType" minOccurs="0" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	      
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
diff --git a/v1_0_0/CDT-cmdhDefaults-v1_0_0.xsd b/v1_0_0/CDT-cmdhDefaults-v1_0_0.xsd
deleted file mode 100644
index d33728cfb1cf3a29ca94c1849fdfcdc25b8bc551..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-cmdhDefaults-v1_0_0.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-  
-    <xs:element name="cmdhDefaults">
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from data type "mgmtResource" -->
-          <xs:extension base="m2m:mgmtResource">
-	          <xs:sequence>
-	            <!-- this resource type has no mgmtObj specialization-specific Attributes -->
-	            <!-- Instantiations of this [cmdhDefaults] resource type shall include mgmntLink's to
-	               the following children:
-              1 or more mgmtLink to instance(s) of resource type [cmdhDefEcValue]
-	            1 or more mgmtLink to instance(s) of resource type [cmdhEcDefParamValues]              -->	    
-	            <!-- TODO: text in Table D.12.2-2 column "Default Value and Constraints" needs to be updated
-	                       ref to [cmdhEcDefParamValues] is missing  -->
-              <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="2" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:extension>  
-        </xs:complexContent>
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
diff --git a/v1_0_0/CDT-cmdhEcDefParamValues-v1_0_0.xsd b/v1_0_0/CDT-cmdhEcDefParamValues-v1_0_0.xsd
deleted file mode 100644
index 0ff274676354e473f178027b28d14fad3ef4dabe..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-cmdhEcDefParamValues-v1_0_0.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-  
-  <xs:element name="cmdhEcDefParamValues">    
-    <xs:complexType>     
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
-            <xs:element name="defaultRequestExpTime" type="xs:long" />  <!-- units in milliseconds -->
-            <xs:element name="defaultResultExpTime" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultOpExecTime" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultRespPersistence" type="xs:long" /> <!-- units in milliseconds -->
-            <xs:element name="defaultDelAggregation" type="xs:boolean" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	    
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
diff --git a/v1_0_0/CDT-cmdhLimits-v1_0_0.xsd b/v1_0_0/CDT-cmdhLimits-v1_0_0.xsd
deleted file mode 100644
index 24c9b48c6e5599938d030156e33649d991b13079..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-cmdhLimits-v1_0_0.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-  <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-  
-  <xs:element name="cmdhLimits">
-    <xs:complexType>
-      
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="order" type="xs:positiveInteger" />
-            <xs:element name="requestOrigin" type="m2m:listOfM2MID" />
-            <!-- TODO In TS-0004 requestContext is shown as xs:string rather than xs:anyType -->
-            <xs:element name="requestContext" type="xs:anyType" />
-            <xs:element name="requestContextNotification" type="xs:boolean"  minOccurs="0" />
-            <!-- TODO In TS-0004 requestCharacteristics is shown as xs:string rather than xs:anyType -->
-            <xs:element name="requestCharacteristics" type="xs:anyType"  />
-            <xs:element name="limitsEventCategory" type="m2m:listOfEventCat" />
-            <xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" />
-            <xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" />
-            <!-- TODO: TS-0004 D.12.5 uses type "m2m:permittedBooleanValues" -->
-            <xs:element name="limitsDelAggregation" >
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                    <xs:annotation>
-                        <xs:documentation>defines data type denoted "m2m:permittedBooleanValues" in TS-0004 D.12.5
-                        </xs:documentation>
-                    </xs:annotation>
-                    <!-- False -->
-                    <xs:enumeration value="0" />
-                    <!-- True -->
-                    <xs:enumeration value="1" />
-                    <!-- True and False -->
-                    <xs:enumeration value="0 1" />
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:element>         
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	    
-    </xs:complexType>
-  </xs:element>
-  
-</xs:schema> 
diff --git a/v1_0_0/CDT-cmdhNetworkAccessRules-v1_0_0.xsd b/v1_0_0/CDT-cmdhNetworkAccessRules-v1_0_0.xsd
deleted file mode 100644
index 5bd8e845978432b3978620b9a17eed7277f84bd8..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-cmdhNetworkAccessRules-v1_0_0.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-  
-  <xs:element name="cmdhNetworkAccessRules">
-    <xs:complexType>
-      
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-             <xs:element name="applicableEventCategories" type="m2m:listOfEventCatWithDef" />
-            <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	               zero or more mgmtLink to instance(s) of resource type [cmdhNwAccessRule]       -->
-            <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	     
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
diff --git a/v1_0_0/CDT-cmdhNwAccessRule-v1_0_0.xsd b/v1_0_0/CDT-cmdhNwAccessRule-v1_0_0.xsd
deleted file mode 100644
index 1a2079db5e530bea2d0f9d9e32367bf35d8cc4d6..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-cmdhNwAccessRule-v1_0_0.xsd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-  targetNamespace="http://www.onem2m.org/xml/protocols" 
-  xmlns:m2m="http://www.onem2m.org/xml/protocols"
-  elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-  
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-  
-  <xs:element name="cmdhNwAccessRule">
-    <xs:complexType>
-      <xs:complexContent>
-        <!-- Inherit Common Attributes from data type "mgmtResource" -->
-        <xs:extension base="m2m:mgmtResource">
-          <xs:sequence>
-            <!-- mgmtObj specialization-specific Attributes -->
-            <xs:element name="targetNetwork" type="m2m:listOfM2MID" minOccurs="1" maxOccurs="1" />
-            <xs:element name="minReqVolume" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1" />
-            <xs:element name="backOffParameters" type="m2m:backOffParameters" minOccurs="1" maxOccurs="1" />
-            <xs:element name="otherConditions" type="xs:anyType" minOccurs="1" maxOccurs="1" />
-            <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	               zero or more mgmtLink to instance(s) of resource type schedule       -->
-            <!-- TODO: clarify if multiple schedule elements shall be included rather than a link to non-mgmtObj specialization -->
-            <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="1" />
-          </xs:sequence>
-        </xs:extension>  
-      </xs:complexContent> 	       
-    </xs:complexType>
-  </xs:element>
-</xs:schema> 
diff --git a/v1_0_0/CDT-cmdhPolicy-v1_0_0.xsd b/v1_0_0/CDT-cmdhPolicy-v1_0_0.xsd
deleted file mode 100644
index 44d46ab504452552e8d6c62253621b8b52fb6706..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-cmdhPolicy-v1_0_0.xsd
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-
-    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-
-    <xs:element name="cmdhPolicy" >
-      <xs:complexType>
-        <xs:complexContent>
-          <!-- Inherit Common Attributes from data type "mgmtResource" -->
-          <xs:extension base="m2m:mgmtResource">
-	        <xs:sequence>
-           <!-- mgmtObj specialization-specific Attributes -->
-              <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" />
-	          <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
-	               the following children:
-	            1 mgmtLink to an instance of resource type [cmdhDefaults], 
-	            1 or more mgmtLink to instance(s) of resource type [cmdhLimits], 
-	            1 or more mgmtLink to instance(s) of resource type [cmdhNetworkAccessRules]
-	            1 or more mgmtLink to instance(s) of resource type [cmdhBuffer]              -->
-	          <xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="4" maxOccurs="unbounded"/>
-
-            </xs:sequence>
-          </xs:extension> 
-        </xs:complexContent> 	       
-      </xs:complexType>
-    </xs:element>
-</xs:schema> 
-
diff --git a/v1_0_0/CDT-commonTypes-v1_0_0.xsd b/v1_0_0/CDT-commonTypes-v1_0_0.xsd
deleted file mode 100644
index 19891f7494a64c88d6d56c77eab47af8df5d969d..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-commonTypes-v1_0_0.xsd
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-
-	<xs:include schemaLocation="CDT-enumerationTypes-v1_0_0.xsd" />
-
-	<!--********************** -->
-	<!-- oneM2M Simple Types   -->
-	<!--********************** -->
-
-	<xs:simpleType name="ID">
-		<xs:restriction base="xs:anyURI" />
-	</xs:simpleType>
-
-	<xs:simpleType name="nodeID">
-		<xs:restriction base="xs:token" />
-	</xs:simpleType>
-
-	<xs:simpleType name="deviceID">
-		<xs:restriction base="xs:token">
-			<xs:pattern value="urn:dev:ops:[\dABCDEFabcdef]{6}-[\w_%]+-[\w_%]+" />
-			<xs:pattern value="urn:dev:os:[\dABCDEFabcdef]{6}-[\w_%]+" />
-			<xs:pattern value="urn:imei:\d{15}" />
-			<xs:pattern value="urn:esn:[\dABCDEFabcdef]{8}" />
-			<xs:pattern value="urn:meid:[\dABCDEFabcdef]{14}" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="externalID">
-		<xs:restriction base="xs:token" />
-	</xs:simpleType>
-
-	<xs:simpleType name="requestID">
-		<xs:restriction base="xs:token" />
-	</xs:simpleType>
-
-	<xs:simpleType name="nhURI">
-		<xs:restriction base="xs:anyURI" />
-	</xs:simpleType>
-	
-	 <xs:simpleType name="acpType">
-        <list itemType="xs:anyURI" />
-    </xs:simpleType>
-
-    <!-- TODO: "labels" is called "labelsType" in  Table 6.3.2-1 -->
-	<xs:simpleType name="labels">
-		<xs:list itemType="xs:token" />
-	</xs:simpleType>
-
-	<!-- TODO: this data type is not used in any of the XSD files. It is listed in TS-0004 without any given use case  -->
-	<xs:simpleType name="networkaccessID">
-		<xs:restriction base="xs:token">
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID") -->
-	<xs:simpleType name="listOfM2MID">
-		<xs:list itemType="m2m:ID" />
-	</xs:simpleType>
-
-	<!-- auxiliary data type required to define "listOflongMin-1" below -->
-	<xs:simpleType name="longMin-1">
-		<xs:restriction base="xs:long">
-			<xs:minInclusive value="-1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- auxiliary data type required to define "listOfMinMax" below -->
-	<xs:simpleType name="listOflongMin-1">
-		<xs:list itemType="m2m:longMin-1" />
-	</xs:simpleType>
-
-	<!-- "listOfMinMax" represents a list of min and max numbers used in attributes of the [cmdhLimits] resource based on  
-		type xs:long in the range -1, 0, 1, 2 ... . Unit is milliseconds. Value setting of -1 expresses infinity -->
-	<xs:simpleType name="listOfMinMax">
-		<xs:restriction base="m2m:listOflongMin-1">
-			<xs:length value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- auxiliary data type required to define "backOffParameters" below -->
-	<xs:simpleType name="listOfNonNegInt">
-		<xs:list itemType="xs:nonNegativeInteger" />
-	</xs:simpleType>
-
-	<!-- "backOffParameters" is an ordered list of 3 nonNegativeInteger numbers: backoffTime, backoffTimeIncrement, maximumBackoffTime 
-		(in that order!), all units in milliseconds -->
-		
-	<xs:simpleType name="backOffParameters">
-		<xs:restriction base="m2m:listOfNonNegInt">
-			<xs:length value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-	 
-	<!-- m2m:ipv4 and m2m:ipv6 and m2m:countryCode are defined in the CDT-accessControlPolicy file -->
-	
-	<xs:simpleType name="pOAList">
-		<xs:list itemType="xs:string" />
-	</xs:simpleType>
-
-    <!--Format is YYYYMMDDThhmmss with no punctuation -->
-	<xs:simpleType name="timestamp">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="\d{4}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|30|31)T([01]\d|2[0-3])[0-5]\d[0-5]\d"></xs:pattern>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="typeOfContent">
-        <xs:restriction base="xs:string">
-            <xs:pattern value="[\w/!#$^_.+&amp;\-]+" />
-        </xs:restriction>
-    </xs:simpleType>
-
-	<xs:simpleType name="contentInfo">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w/!#$^_.+&amp;\-]+(:[0-2])?" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="eventCat">
-        <union>
-            <simpleType>
-                <restriction base='m2m:stdEventCats' />
-            </simpleType>
-            <!-- User-defined range -->
-            <simpleType>
-                <restriction base='xs:integer'>
-                    <xs:minInclusive value="100" />
-                    <xs:maxInclusive value="999" />
-                </restriction>
-            </simpleType>
-        </union>
-    </xs:simpleType>
-
-    <xs:simpleType name="eventCatWithDef">
-        <union>
-            <simpleType>
-                <restriction base='m2m:eventCat' />
-            </simpleType>
-            <!-- User-defined range -->
-            <simpleType>
-                <restriction base='xs:integer'>
-                    <xs:enumeration value="0" />
-                </restriction>
-            </simpleType>
-        </union>
-    </xs:simpleType>
-
-    <xs:simpleType name="listOfEventCat">
-        <list itemType="m2m:eventCat" />
-    </xs:simpleType>
-
-    <xs:simpleType name="listOfEventCatWithDef">
-        <list itemType="m2m:eventCatWithDef" />
-    </xs:simpleType>
-
-	<xs:simpleType name="scheduleEntry">
-		<xs:restriction base="xs:string">
-			<xs:pattern
-				value="(([*]|[1-5]?\d([,-][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,-](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,-]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,-]([1-9]|1[0-2]))*))\s+[*]|([0-6]([,-][0-6])*)" />
-		</xs:restriction>
-	</xs:simpleType>
-
-    <!-- TODO: triggerRecipientID is not in  Table 6.3.2-1 -->
-	<xs:simpleType name="triggerRecipientID">
-		<xs:restriction base="xs:unsignedInt" />
-	</xs:simpleType>
-
-	<xs:simpleType name="listOfURIs">
-		<list itemType="xs:anyURI" />
-	</xs:simpleType>
-
-
-	<!--********************** -->
-	<!-- oneM2M Complex Types -->
-	<!--********************** -->
-
-	<xs:complexType name="deliveryMetaData">
-		<xs:sequence>
-			<xs:sequence>
-				<xs:element name="tracingOption" type="xs:boolean" />
-				<xs:element name="tracingInfo" type="m2m:listOfM2MID" />
-				<!-- should tracing Info be list of anyURI? -->
-			</xs:sequence>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="aggregatedRequest">
-		<xs:sequence>
-			<xs:element name="request" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="operation" type="m2m:operation" />
-						<xs:element name="to" type="xs:anyURI" />
-						<xs:element name="from" type="m2m:ID" />
-						<xs:element name="requestIdentifier" type="m2m:requestID" />
-						<xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
-						<xs:element name="metaInformation" type="m2m:metaInformation" minOccurs="0" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="metaInformation">
-		<xs:sequence>
-			<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
-			<xs:element name="name" type="xs:string" minOccurs="0" />
-			<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="operationalExecutionTime" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="responseType" type="m2m:responseType" minOccurs="0" />
-			<xs:element name="resultPersistence" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
-			<xs:element name="eventCategory" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="eventCatType" type="m2m:eventCat" />
-						<xs:element name="eventCatNo" type="xs:nonNegativeInteger" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
-			<xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" />
-			<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" />
-			<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="primitiveContent">
-		<xs:sequence>
-			<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<!-- m2m:batchNotify and m2m:eventNotificationCriteria are defined in the subscription resource file --> 
-
-	<xs:complexType name="filterCriteria">
-		<xs:sequence>
-			<xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="labels" type="m2m:labels" minOccurs="0" />
-			<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
-			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="contentType" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" />
-			<xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-    <!-- TODO: The format for attribute shown in clause 6.3.4 cannot take complex content, so it is done differently here -->
-	<xs:complexType name="attribute">
-		<xs:sequence>
-			<xs:element name="name" type="xs:NCName" />
-			<xs:element name="value" type="xs:anyType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="attributeList">
-		<xs:sequence>
-			<xs:element name="attribute" type="m2m:attribute" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="scheduleEntries">
-		<xs:sequence>
-			<xs:element name="scheduleEntry" type="m2m:scheduleEntry" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<!-- m2m:aggregatedNotification and m2m:Notification are in the Notification xsd file -->
-
-	<!-- "actionStatus" is used across mgmtObj resources -->
-	<xs:complexType name="actionStatus">
-		<xs:sequence>
-			<xs:element name="action" type="xs:anyURI" minOccurs="0" />
-			<xs:element name="status" type="m2m:status" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<!-- TODO: TS-0004 calls the member elements "name" and "type", but name and value seems more appropriate -->
-	<xs:complexType name="anyArgType">
-		<xs:sequence>
-			<xs:element name="name" type="xs:NCName" />
-			<xs:element name="value" type="xs:anyType" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="resetArgsType">
-		<xs:sequence>
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="rebootArgsType">
-		<xs:sequence>
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="uploadArgsType">
-		<xs:sequence>
-			<xs:element name="fileType" type="xs:string" />
-			<xs:element name="URL" type="xs:anyURI" />
-			<xs:element name="username" type="xs:string" />
-			<xs:element name="password" type="xs:string" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="downloadArgsType">
-		<xs:sequence>
-			<xs:element name="fileType" type="xs:string" />
-			<xs:element name="URL" type="xs:anyURI" />
-			<xs:element name="username" type="xs:string" />
-			<xs:element name="password" type="xs:string" />
-			<xs:element name="filesize" type="xs:string" />
-			<xs:element name="targetFile" type="xs:string" />
-			<xs:element name="delaySeconds" type="xs:int" />
-			<xs:element name="successURL" type="xs:anyURI" />
-			<xs:element name="startTime" type="m2m:timestamp" />
-			<xs:element name="completeTime" type="m2m:timestamp" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="softwareInstallArgsType">
-		<xs:sequence>
-			<xs:element name="URL" type="xs:anyURI" />
-			<xs:element name="UUID" type="xs:string" />
-			<xs:element name="username" type="xs:string" />
-			<xs:element name="password" type="xs:string" />
-			<xs:element name="executionEnvRef" type="xs:string" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="softwareUpdateArgsType">
-		<xs:sequence>
-			<xs:element name="UUID" type="xs:string" />
-			<xs:element name="version" type="xs:string" />
-			<xs:element name="URL" type="xs:anyURI" />
-			<xs:element name="username" type="xs:string" />
-			<xs:element name="password" type="xs:string" />
-			<xs:element name="executionEnvRef" type="xs:string" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="softwareUninstallArgsType">
-		<xs:sequence>
-			<xs:element name="UUID" type="xs:string" />
-			<xs:element name="version" type="xs:string" />
-			<xs:element name="executionEnvRef" type="xs:string" />
-			<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-	
-    <!-- TODO: - TS-0004 also shows an anyArg option, but this isn't compatible with the cmdType, so has been omitted -->
-	<xs:complexType name="execReqArgsListType">
-		<xs:choice>
-			<xs:element name="reset" type="m2m:resetArgsType" maxOccurs="unbounded" />
-			<xs:element name="reboot" type="m2m:rebootArgsType" maxOccurs="unbounded" />
-			<xs:element name="upload" type="m2m:uploadArgsType" maxOccurs="unbounded" />
-			<xs:element name="download" type="m2m:downloadArgsType" maxOccurs="unbounded" />
-			<xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" maxOccurs="unbounded" />
-			<xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType" maxOccurs="unbounded" />
-			<xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType" maxOccurs="unbounded" />
-<!-- 			<xs:element name="anyArg" type="m2m:anyArgsListType" minOccurs="0" maxOccurs="unbounded" /> -->
-		</xs:choice>
-	</xs:complexType>
-
-  <!-- TODO: - TS-0004 gives the datatype of name as xs:string   -->
-	<xs:complexType name="mgmtLinkRef">
-		<xs:simpleContent>
-			<xs:extension base="xs:anyURI">
-				<xs:attribute name="name" type="xs:NCName" use="required" />
-				<xs:attribute name="type" type="m2m:mgmtDefinition" use="required" />
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-
-	<xs:complexType name="resourceWrapper">
-		<xs:complexContent>
-			<xs:extension base="m2m:resource">
-				<xs:attribute name="URI" type="xs:anyURI" use="required" />
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-    <!--  m2m:accessControlRule and m2m:locationRegion are defined in the accessControlPolicy xsd file -->
-
-  <!-- TODO: - TS-0004 gives the datatype of name as xs:string   -->
-	<xs:complexType name="childResourceRef">
-		<xs:simpleContent>
-			<xs:extension base="xs:anyURI">
-				<xs:attribute name="resourceName" type="xs:NCName" use="required" />
-				<xs:attribute name="type" type="m2m:resourceType" use="required" />
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-
- <!-- TODO: - This is in TS-0004 but is not used by any other schema  -->
-    <xs:complexType name="responseTypeInfo">
-        <xs:sequence>
-            <xs:element name="responseType" type="m2m:responseType" />
-            <xs:element name="notificationURI" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-    </xs:complexType>
-
-	<!-- TODO: order of elements should be aligned with the one in responsePrimitive -->
-	<xs:complexType name="operationResult">
-		<xs:sequence>
-			<xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
-			<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
-			<xs:element name="from" type="m2m:ID" minOccurs="0" />
-			<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="requestIdentifier" type="m2m:requestID" />
-			<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="to" type="xs:anyURI" minOccurs="0" />
-			<xs:element name="responseStatusCode" type="m2m:responseStatusCode" />
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources Each oneM2M 
-		Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is 
-		defined below -->
-
-	<xs:complexType name="resource">
-		<xs:sequence>
-			<xs:element name="resourceType" type="m2m:resourceType" />
-			<xs:element name="resourceID" type="m2m:ID" />
-			<xs:element name="parentID" type="m2m:nhURI" />
-			<xs:element name="creationTime" type="m2m:timestamp" />
-			<xs:element name="lastModifiedTime" type="m2m:timestamp" />
-			<xs:element name="labels" type="m2m:labels" minOccurs="0" />
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:token" use="required" />
-	</xs:complexType>
-
-	<xs:complexType name="regularResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announceableResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:regularResource">
-				<xs:sequence>
-					<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="announcedAttribute" minOccurs="0">
-						<xs:simpleType>
-							<xs:list itemType="xs:token" />
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announcedResource">
-		<xs:complexContent>
-			<!-- AccessControlPolicyIDs is mandatory for announced resources but not for the original ones -->
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="accessControlPolicyIDs" type="m2m:acpType" />
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-					<xs:element name="link" type="xs:anyURI" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announceableSubordinateResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-					<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="announcedAttribute" minOccurs="0">
-						<xs:simpleType>
-							<xs:list itemType="xs:token" />
-						</xs:simpleType>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announcedSubordinateResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:resource">
-				<xs:sequence>
-					<xs:element name="expirationTime" type="m2m:timestamp" />
-					<xs:element name="link" type="xs:anyURI" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="mgmtResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:announceableResource">
-				<xs:sequence>
-					<xs:element name="mgmtDefinition" type="m2m:mgmtDefinition" />
-					<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="description" type="xs:string" minOccurs="0" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="announcedMgmtResource">
-		<xs:complexContent>
-			<xs:extension base="m2m:announcedResource">
-				<xs:sequence>
-					<xs:element name="mgmtDefinition" type="m2m:mgmtDefinition" />
-					<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
-					<xs:element name="description" type="xs:string" minOccurs="0" />
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-</xs:schema>
diff --git a/v1_0_0/CDT-container-v1_0_0.xsd b/v1_0_0/CDT-container-v1_0_0.xsd
deleted file mode 100644
index 1732e7c3c628feba41ac9fe99168823ba760663e..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-container-v1_0_0.xsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-	
-<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-contentInstance-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="container">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="creator" type="m2m:ID" />
-						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
-						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
-						<xs:element name="locationID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:element name="latest" type="xs:anyURI" />
-						<xs:element name="oldest" type="xs:anyURI" />
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:contentInstance" />
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="containerAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
-						<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
-						<xs:element name="locationID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:contentInstance" />
-								<xs:element ref="m2m:contentInstanceAnnc" />
-								<xs:element ref="m2m:container" />
-								<xs:element ref="m2m:containerAnnc" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/v1_0_0/CDT-contentInstance-v1_0_0.xsd b/v1_0_0/CDT-contentInstance-v1_0_0.xsd
deleted file mode 100644
index a57f8f5b3520fbcee3bc1915c32c9855b0c23c0a..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-contentInstance-v1_0_0.xsd
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-
-
-
-	<xs:element name="contentInstance">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableSubordinateResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
-						<xs:element name="contentSize" type="xs:nonNegativeInteger" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="content" type="xs:anyType" />
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="contentInstanceAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedSubordinateResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
-						<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="content" type="xs:anyType" minOccurs="0" />
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/v1_0_0/CDT-delivery-v1_0_0.xsd b/v1_0_0/CDT-delivery-v1_0_0.xsd
deleted file mode 100644
index ef65a6e195e7a518b5dbb7c431e6ce5243edcee8..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-delivery-v1_0_0.xsd
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-
-	<xs:element name="delivery">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="source" type="m2m:ID" />
-						<xs:element name="target" type="m2m:ID" />
-						<xs:element name="lifespan" type="m2m:timestamp" />
-						<xs:element name="eventCat" type="m2m:eventCat" />
-						<xs:element name="deliveryMetaData" type="m2m:deliveryMetaData" />
-						<xs:element name="aggregatedRequest" type="m2m:aggregatedRequest" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription"></xs:element>
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/v1_0_0/CDT-deviceCapability-v1_0_0.xsd b/v1_0_0/CDT-deviceCapability-v1_0_0.xsd
deleted file mode 100644
index 0d8d32576430873cc51d4d3a6f223664b5340096..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-deviceCapability-v1_0_0.xsd
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="deviceCapability">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from mgmtResource  -->
-				<xs:extension base="m2m:mgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="capabilityName" type="xs:string" />
-						<xs:element name="attached" type="xs:boolean" />
-						<xs:element name="capabilityActionStatus" type="m2m:actionStatus" />
-						<xs:element name="currentState" type="xs:boolean" />
-						<xs:element name="enable" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="disable" type="xs:boolean" minOccurs="0"/>
-			  
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="deviceCapabilityAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from announcedMgmtResource  -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="capabilityName" type="xs:string" minOccurs="0" />
-						<xs:element name="attached" type="xs:boolean" minOccurs="0" />
-						<xs:element name="capabilityActionStatus" type="m2m:actionStatus" minOccurs="0" />
-						<xs:element name="currentState" type="xs:boolean" minOccurs="0" />
-						<xs:element name="enable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="disable" type="xs:boolean" minOccurs="0" />
-			  
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />  
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-deviceInfo-v1_0_0.xsd b/v1_0_0/CDT-deviceInfo-v1_0_0.xsd
deleted file mode 100644
index 1f174a49b4c51620b06642aa9908110c5f03aa66..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-deviceInfo-v1_0_0.xsd
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="deviceInfo">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from mgmtResource  -->
-				<xs:extension base="m2m:mgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="deviceLabel" type="xs:string" />
-						<xs:element name="manufacturer" type="xs:string" />
-						<xs:element name="model" type="xs:string" />
-						<xs:element name="deviceType" type="xs:string" />
-						<xs:element name="fwVersion" type="xs:string" />
-						<xs:element name="swVersion" type="xs:string" />
-						<xs:element name="hwVersion" type="xs:string" />
-			   
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>  
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="deviceInfoAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from announcedMgmtResource  -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes  -->
-						<xs:element name="deviceLabel" type="xs:string" minOccurs="0" />
-						<xs:element name="manufacturer" type="xs:string" minOccurs="0" />
-						<xs:element name="model" type="xs:string" minOccurs="0" />
-						<xs:element name="deviceType" type="xs:string" minOccurs="0" />
-						<xs:element name="fwVersion" type="xs:string" minOccurs="0" />
-						<xs:element name="swVersion" type="xs:string" minOccurs="0" />
-						<xs:element name="hwVersion" type="xs:string" minOccurs="0" />
-			   
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>  
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-enumerationTypes-v1_0_0.xsd b/v1_0_0/CDT-enumerationTypes-v1_0_0.xsd
deleted file mode 100644
index eef31beb7c567f1309a8ef8aca08ff02ccac3e2f..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-enumerationTypes-v1_0_0.xsd
+++ /dev/null
@@ -1,894 +0,0 @@
-<?xml version="1.0" ?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:m2m="http://www.onem2m.org/xml/protocols"
-	targetNamespace="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified">
-
-	<xs:simpleType name="resourceType">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- accessControlPolicy -->
-			<xs:enumeration value="1" />
-			<!-- AE -->
-			<xs:enumeration value="2" />
-			<!-- container -->
-			<xs:enumeration value="3" />
-			<!-- contentInstance -->
-			<xs:enumeration value="4" />
-			<!-- CSEBase -->
-			<xs:enumeration value="5" />
-			<!-- delivery -->
-			<xs:enumeration value="6" />
-			<!-- eventConfig -->
-			<xs:enumeration value="7" />
-			<!-- execInstance -->
-			<xs:enumeration value="8" />
-			<!-- group -->
-			<xs:enumeration value="9" />
-			<!-- locationPolicy -->
-			<xs:enumeration value="10" />
-			<!-- m2mServiceSubscriptionProfile -->
-			<xs:enumeration value="11" />
-			<!-- mgmtCmd -->
-			<xs:enumeration value="12" />
-			<!-- mgmtObj -->
-			<xs:enumeration value="13" />
-			<!-- node -->
-			<xs:enumeration value="14" />
-			<!-- pollingChannel -->
-			<xs:enumeration value="15" />
-			<!-- remoteCSE -->
-			<xs:enumeration value="16" />
-			<!-- request -->
-			<xs:enumeration value="17" />
-			<!-- schedule -->
-			<xs:enumeration value="18" />
-			<!-- serviceSubscribedAppRule -->
-            <xs:enumeration value="19" />
-            <!-- serviceSubscribedNode -->
-			<xs:enumeration value="20" />
-			<!-- statsCollect -->
-			<xs:enumeration value="21" />
-			<!-- statsConfig -->
-			<xs:enumeration value="22" />
-			<!-- subscription -->
-			<xs:enumeration value="23" />
-			<!-- accessControlPolicyAnnc -->
-			<xs:enumeration value="10001" />
-			<!-- AEAnnc -->
-			<xs:enumeration value="10002" />
-			<!-- containerAnnc -->
-			<xs:enumeration value="10003" />
-			<!-- contentInstanceAnnc -->
-			<xs:enumeration value="10004" />
-			<!-- groupAnnc -->
-			<xs:enumeration value="10009" />
-			<!-- locationPolicyAnnc -->
-			<xs:enumeration value="10010" />
-			<!-- mgmtObjAnnc -->
-			<xs:enumeration value="10013" />
-			<!-- nodeAnnc -->
-			<xs:enumeration value="10014" />
-			<!-- remoteCSEAnnc -->
-			<xs:enumeration value="10016" />
-			<!-- scheduleAnnc -->
-			<xs:enumeration value="10018" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="cseTypeID">
-		<xs:annotation>
-			<xs:documentation>Used for cseType attribute of &lt;CSEBase&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- IN-CSE -->
-			<xs:enumeration value="1" />
-			<!-- MN-CSE -->
-			<xs:enumeration value="2" />
-			<!-- ASN-CSE -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="locationSource">
-		<xs:annotation>
-			<xs:documentation>Used for locationSource attribute of &lt;locationPolicy&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Network-based -->
-			<xs:enumeration value="1" />
-			<!-- Device-based -->
-			<xs:enumeration value="2" />
-			<!-- Sharing-based -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="stdEventCats">
-		<xs:annotation>
-			<xs:documentation>Used for ec parameter in request and eventCat attribute of &lt;delivery&gt; resource and cmdh
-				policy resource types.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Default -->
-			<xs:enumeration value="1" />
-			<!-- Immediate -->
-			<xs:enumeration value="2" />
-			<!-- BestEffort -->
-			<xs:enumeration value="3" />
-			<!-- Latest -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="operation">
-		<xs:annotation>
-			<xs:documentation>Used for Operation parameter in request and operation attribute in &lt;request&gt; resource as well as resource as well as operationMonitor
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Create -->
-			<xs:enumeration value="1" />
-			<!-- Retrieve -->
-			<xs:enumeration value="2" />
-			<!-- Update -->
-			<xs:enumeration value="3" />
-			<!-- Delete -->
-			<xs:enumeration value="4" />
-			<!-- Notify -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="responseType">
-		<xs:annotation>
-			<xs:documentation>Used for rt parameter in request and operation attribute in &lt;request&gt; resource
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- nonBlockingRequestSynch -->
-			<xs:enumeration value="1" />
-			<!-- nonBlockingRequestAsynch -->
-			<xs:enumeration value="2" />
-			<!-- blockingRequest -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="resultContent">
-		<xs:annotation>
-			<xs:documentation>Used for Result Content parameter in request.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Nothing -->
-			<xs:enumeration value="0" />
-			<!-- Attributes -->
-			<xs:enumeration value="1" />
-			<!-- Hierarchical Address -->
-            <xs:enumeration value="2" />
-            <!-- Hierarchical Address + Attributes -->
-            <xs:enumeration value="3" />
-			<!-- Attributes + Child Resources -->
-			<xs:enumeration value="4" />
-			<!-- Attributes + Child Resource References -->
-            <xs:enumeration value="5" />
-			<!-- Child Resource References -->
-			<xs:enumeration value="6" />
-			<!-- Original Resource -->
-			<xs:enumeration value="7" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="discResType">
-		<xs:annotation>
-			<xs:documentation>Used in &lt;request&gt; </xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- hierarchical -->
-			<xs:enumeration value="1" />
-			<!-- Non-hierarchical -->
-			<xs:enumeration value="2" />
-			<!-- cseID+resourceID -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="responseStatusCode">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-		    <!-- ACCEPTED     -->
-			<xs:enumeration value="1000" />
-			<!-- OK           -->
-            <xs:enumeration value="2000" />
-            <!-- CREATED      -->
-            <xs:enumeration value="2001" />         
-            <!-- DELETED      -->
-            <xs:enumeration value="2002" />
-            <!-- CHANGED      -->
-            <xs:enumeration value="2004" />
-            <!-- BAD_REQUEST  -->
-            <xs:enumeration value="4000" />            
-            <!-- NOT_FOUND    -->
-            <xs:enumeration value="4004" />            
-            <!-- OPERATION_NOT_ALLOWED  -->
-            <xs:enumeration value="4005" />            
-            <!-- REQUEST_TIMEOUT  -->
-            <xs:enumeration value="4008" />            
-            <!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
-            <xs:enumeration value="4101" />            
-            <!-- CONTENTS_UNACCEPTABLE  -->
-            <xs:enumeration value="4102" />              
-            <!-- ACCESS_DENIED    -->
-            <xs:enumeration value="4103" />              
-            <!-- GROUP_REQUEST_IDENTIFIER_EXISTS  -->
-            <xs:enumeration value="4104" />              
-            <!-- CONFLICT                  -->
-            <xs:enumeration value="4105" />              
-            <!-- INTERNAL_SERVER_ERROR     -->
-            <xs:enumeration value="5000" />              
-            <!-- NOT_IMPLEMENTED           -->
-            <xs:enumeration value="5001" />
-            <!-- TARGET_NOT_REACHABLE      -->
-            <xs:enumeration value="5103" />             
-            <!-- NO_PRIVILEGE              -->
-            <xs:enumeration value="5105" />            
-            <!-- ALREADY_EXISTS            -->
-            <xs:enumeration value="5106" />            
-            <!-- TARGET_NOT_SUBSCRIBABLE   -->
-            <xs:enumeration value="5203" />            
-            <!-- SUBSCRIPTION_VERIFICATION_INITIATION_FAILED   -->
-            <xs:enumeration value="5204" />            
-            <!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE     -->
-            <xs:enumeration value="5205" />            
-            <!-- NON_BLOCKING_REQUEST_NOT_SUPPORTED     -->
-            <xs:enumeration value="5206" />            
-            <!-- EXTERNAL_OBJECT_NOT_REACHABLE          -->
-            <xs:enumeration value="6003" />              
-            <!-- EXTERNAL_OBJECT_NOT_FOUND              -->
-            <xs:enumeration value="6005" />  
-            <!-- TODO: Typo in the table in TS-0004     -->           
-            <!-- MAX_NUMBER_OF_MEMBER_EXCEEDED          -->
-            <xs:enumeration value="6010" />              
-            <!-- MEMBER_TYPE_INCONSISTENT               -->
-            <xs:enumeration value="6011" />               
-            <!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED     -->
-            <xs:enumeration value="6020" />               
-            <!-- MGMT_SESSION_ESTABLISHMENT _TIMEOUT    -->
-            <xs:enumeration value="6021" />               
-            <!-- INVALID_CMDTYPE                        -->
-            <xs:enumeration value="6022" />               
-            <!-- INVALID_ARGUMENTS                      -->
-            <xs:enumeration value="6023" />               
-            <!-- INSUFFICIENT_ARGUMENTS                 -->
-            <xs:enumeration value="6024" />               
-            <!-- MGMT_ CONVERSION_ERROR                 -->
-            <xs:enumeration value="6025" />               
-            <!-- MGMT_ CANCELATION_FAILURE              -->
-            <xs:enumeration value="6026" />               
-            <!-- ALREADY_COMPLETE                       -->
-            <xs:enumeration value="6028" />               
-            <!-- MGMT_COMMAND_NOT_CANCELLABLE           -->
-            <xs:enumeration value="6029" />                
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="requestStatus">
-		<xs:annotation>
-			<xs:documentation>Used for request Status in the &lt;request&gt; resource</xs:documentation>
-		</xs:annotation>
-        <xs:restriction base="xs:integer">
-            <!-- COMPLETED -->
-            <xs:enumeration value="1" />
-            <!-- FAILED -->
-            <xs:enumeration value="2" />
-            <!-- PENDING -->
-            <xs:enumeration value="3" />
-            <!-- FORWARDED -->
-            <xs:enumeration value="4" />
-        </xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="memberType">
-		<xs:annotation>
-			<xs:documentation>Used for memberType attribute in &lt;group&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- accessControlPolicy -->
-			<xs:enumeration value="1" />
-			<!-- AE -->
-			<xs:enumeration value="2" />
-			<!-- container -->
-			<xs:enumeration value="3" />
-			<!-- contentInstance -->
-			<xs:enumeration value="4" />
-			<!-- CSEBase -->
-			<xs:enumeration value="5" />
-			<!-- delivery -->
-			<xs:enumeration value="6" />
-			<!-- eventConfig -->
-			<xs:enumeration value="7" />
-			<!-- execInstance -->
-			<xs:enumeration value="8" />
-			<!-- group -->
-			<xs:enumeration value="9" />
-			<!-- locationPolicy --> 
-			<xs:enumeration value="10" />
-			<!-- m2mServiceSubscription -->
-			<xs:enumeration value="11" />
-			<!-- mgmtCmd -->
-			<xs:enumeration value="12" />
-			<!-- mgmtObj -->
-			<xs:enumeration value="13" />
-			<!-- node -->
-			<xs:enumeration value="14" />
-			<!-- pollingChannel -->
-			<xs:enumeration value="15" />
-			<!-- remoteCSE -->
-			<xs:enumeration value="16" />
-			<!-- request -->
-			<xs:enumeration value="17" />
-			<!-- schedule -->
-            <xs:enumeration value="18" />
-			<!-- serviceSubscribedAppRule -->
-            <xs:enumeration value="19" />
-			<!-- serviceSubscribedNode -->
-            <xs:enumeration value="20" />
-            <!-- statsCollect -->
-            <xs:enumeration value="21" />
-            <!-- statsConfig -->
-            <xs:enumeration value="22" />
-            <!-- subscription -->
-            <xs:enumeration value="23" />
-		
-			<!-- Mixed -->
-			<xs:enumeration value="24" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="consistencyStrategy">
-		<xs:annotation>
-			<xs:documentation>Used for consistencyStrategy attribute in &lt;group&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- ABANDON_MEMBER -->
-			<xs:enumeration value="1" />
-			<!-- ABANDON_GROUP -->
-			<xs:enumeration value="2" />
-			<!-- SET_MIXED -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="cmdType">
-		<xs:annotation>
-			<xs:documentation>Used for cmdType attribute in &lt;mgmtCmd&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- RESET -->
-			<xs:enumeration value="1" />
-			<!-- REBOOT -->
-			<xs:enumeration value="2" />
-			<!-- UPLOAD -->
-			<xs:enumeration value="3" />
-			<!-- DOWNLOAD -->
-			<xs:enumeration value="4" />
-			<!-- SOFTWAREINSTALL -->
-			<xs:enumeration value="5" />
-			<!-- SOFTWAREUNINSTALL -->
-			<xs:enumeration value="6" />
-			<!-- SOFTWAREUPDATE -->
-            <xs:enumeration value="7" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="execModeType">
-		<xs:annotation>
-			<xs:documentation>Used for execModeType attribute in &lt;mgmtCmd&gt; and &lt;execInstance&gt; resource.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- IMMEDIATEONCE -->
-			<xs:enumeration value="1" />
-			<!-- IMMEDIATEREPEAT -->
-			<xs:enumeration value="2" />
-			<!-- RANDOMONCE -->
-			<xs:enumeration value="3" />
-			<!-- RANDOMREPEAT -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="execStatusType">
-		<xs:annotation>
-			<xs:documentation>Used for execStatusType attribute in &lt;execInstance&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- INITIATED -->
-			<xs:enumeration value="1" />
-			<!-- PENDING  -->
-			<xs:enumeration value="2" />
-			<!-- FINISHED -->
-			<xs:enumeration value="3" />
-			<!-- CANCELLING -->
-			<xs:enumeration value="4" />
-			<!-- CANCELLED -->
-			<xs:enumeration value="5" />
-			<!-- STATUS_ NON_CANCELLABLE -->
-			<xs:enumeration value="6" />
-		</xs:restriction>
-	</xs:simpleType>
-
-
-	<xs:simpleType name="execResultType">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- STATUS_REQUEST_UNSUPPORTED -->
-			<xs:enumeration value="1" />
-			<!-- STATUS_REQUEST DENIED -->
-			<xs:enumeration value="2" />
-			<!-- STATUS_CANCELLATION_DENIED -->
-			<xs:enumeration value="3" />
-			<!-- STATUS_INTERNAL_ERROR -->
-			<xs:enumeration value="4" />
-			<!-- STATUS_INVALID_ARGUMENTS -->
-			<xs:enumeration value="5" />
-			<!-- STATUS_RESOURCES_EXCEEDED -->
-			<xs:enumeration value="6" />
-			<!-- STATUS_FILE_TRANSFER_FAILED -->
-			<xs:enumeration value="7" />
-			<!-- STATUS_FILE_TRANSFER_SERVER_AUTHENTICATION_FAILURE -->
-			<xs:enumeration value="8" />
-			<!-- STATUS_UNSUPPORTED_PROTOCOL -->
-			<xs:enumeration value="9" />
-			<!-- STATUS_UPLOAD_FAILED -->
-			<xs:enumeration value="10" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_MULTICAST_GROUP_UNABLE_JOIN -->
-			<xs:enumeration value="11" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_SERVER_CONTACT_FAILED -->
-			<xs:enumeration value="12" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_FILE_ACCESS_FAILED -->
-			<xs:enumeration value="13" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_DOWNLOAD_INCOMPLETE -->
-			<xs:enumeration value="14" />
-			<!-- STATUS_FILE_TRANSFER_FAILED_FILE_CORRUPTED -->
-			<xs:enumeration value="15" />
-			<!-- STATUS_FILE_TRANSFER_FILE_AUTHENTICATION_FAILURE -->
-			<xs:enumeration value="16" />
-			<!-- STATUS_FILE_TRANSFER_FAILED -->
-			<xs:enumeration value="17" />
-			<!-- STATUS_FILE_TRANSFER_SERVER_AUTHENTICATION_FAILURE -->
-			<xs:enumeration value="18" />
-			<!-- STATUS_FILE_TRANSFER_WINDOW_EXCEEDED -->
-			<xs:enumeration value="19" />
-			<!-- STATUS_INVALID_UUID_FORMAT -->
-			<xs:enumeration value="20" />
-			<!-- STATUS_UNKNOWN_EXECUTION_ENVIRONMENT -->
-			<xs:enumeration value="21" />
-			<!-- STATUS_DISABLED_EXECUTION_ENVIRONMENT -->
-			<xs:enumeration value="22" />
-			<!-- STATUS_EXECUTION_ENVIRONMENT_MISMATCH -->
-			<xs:enumeration value="23" />
-			<!-- STATUS_DUPLICATE_DEPLOYMENT_UNIT -->
-			<xs:enumeration value="24" />
-			<!-- STATUS_SYSTEM_RESOURCES_EXCEEDED -->
-			<xs:enumeration value="25" />
-			<!-- STATUS_UNKNOWN_DEPLOYMENT_UNIT -->
-			<xs:enumeration value="26" />
-			<!-- STATUS_INVALID_DEPLOYMENT_UNIT_STATE -->
-			<xs:enumeration value="27" />
-			<!-- STATUS_INVALID_DEPLOYMENT_UNIT_UPDATE_DOWNGRADE_DISALLOWED -->
-			<xs:enumeration value="28" />
-			<!-- STATUS_INVALID_DEPLOYMENT_UNIT_UPDATE_UPGRADE_DISALLOWED -->
-			<xs:enumeration value="29" />
-			<!-- STATUS_INVALID_DEPLOYMENT_UNIT_UPDATE_VERSION_EXISTS -->
-			<xs:enumeration value="30" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="pendingNotification">
-		<xs:annotation>
-			<xs:documentation>This is used for pendingNotification attribute in &lt;subscription&gt; resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- sendLatest -->
-			<xs:enumeration value="1" />
-			<!-- sendAllPending -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="notificationContentType">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- modifiedAttributes -->
-			<xs:enumeration value="1" />
-			<!-- wholeResource -->
-			<xs:enumeration value="2" />
-			<!-- referenceOnly -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="resourceStatus">
-		<xs:annotation>
-			<xs:documentation></xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- childCreated -->
-			<xs:enumeration value="1" />
-			<!-- childDeleted -->
-			<xs:enumeration value="2" />
-			<!-- updated -->
-			<xs:enumeration value="3" />
-			<!-- deleted -->
-			<xs:enumeration value="4" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	
-	<xs:simpleType name="status">
-		<xs:annotation>
-			<xs:documentation>This is used for [software], [firmware] resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Successful -->
-			<xs:enumeration value="1" />
-			<!-- Failure -->
-			<xs:enumeration value="2" />
-			<!-- In-Process -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="batteryStatus">
-		<xs:annotation>
-			<xs:documentation>This is used for [software], [firmware] resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- NORMAL -->
-			<xs:enumeration value="1" />
-			<!-- CHARGING -->
-			<xs:enumeration value="2" />
-			<!-- CHARGING-COMPLETE -->
-			<xs:enumeration value="3" />
-			<!-- DAMAGED -->
-			<xs:enumeration value="4" />
-			<!-- LOW-BATTERY -->
-			<xs:enumeration value="5" />
-			<!-- NOT-INSTALLED -->
-			<xs:enumeration value="6" />
-			<!-- UNKNOWN -->
-			<xs:enumeration value="7" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="mgmtDefinition">
-		<xs:annotation>
-			<xs:documentation>This is used for mgmtObj resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- unspecified -->
-			<xs:enumeration value="0" />
-			<!-- firmware -->
-			<xs:enumeration value="1001" />
-			<!-- software -->
-			<xs:enumeration value="1002" />
-			<!-- memory -->
-			<xs:enumeration value="1003" />
-			<!-- areaNwkInfo -->
-			<xs:enumeration value="1004" />
-			<!-- areaNwkDeviceInfo -->
-			<xs:enumeration value="1005" />
-			<!-- battery -->
-			<xs:enumeration value="1006" />
-			<!-- deviceInfo -->
-			<xs:enumeration value="1007" />
-			<!-- deviceCapability -->
-			<xs:enumeration value="1008" />
-			<!-- reboot -->
-			<xs:enumeration value="1009" />
-			<!-- eventLog -->
-			<xs:enumeration value="1010" />
-			<!-- cmdhPolicy -->
-			<xs:enumeration value="1011" />
-			<!-- activeCmdhPolicy -->
-			<xs:enumeration value="1012" />
-			<!-- cmdhDefaults -->
-			<xs:enumeration value="1013" />
-			<!-- cmdhDefEcValue -->
-			<xs:enumeration value="1014" />
-			<!-- cmdhEcDefParamValues -->
-			<xs:enumeration value="1015" />
-			<!-- cmdhLimits -->
-			<xs:enumeration value="1016" />
-			<!-- cmdhNetworkAccessRules -->
-			<xs:enumeration value="1017" />
-			<!-- cmdhNwAccessRule -->
-			<xs:enumeration value="1018" />
-			<!-- cmdhBuffer -->
-			<xs:enumeration value="1019" />
-
-
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="logTypeId">
-		<xs:annotation>
-			<xs:documentation>Used for the logTypeId attribute of [eventLog] Management Resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- system -->
-			<xs:enumeration value="1" />
-			<!-- security -->
-			<xs:enumeration value="2" />
-			<!-- event -->
-			<xs:enumeration value="3" />
-			<!-- trace -->
-			<xs:enumeration value="4" />
-			<!-- panic -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="logStatus">
-		<xs:annotation>
-			<xs:documentation>Used for the logStatus attribute of [eventLog] Management Resource.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- Started -->
-			<xs:enumeration value="1" />
-			<!-- Stopped -->
-			<xs:enumeration value="2" />
-			<!-- Unknown -->
-			<xs:enumeration value="3" />
-			<!-- NotPresent -->
-			<xs:enumeration value="4" />
-			<!-- Error -->
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="eventType">
-		<xs:restriction base="xs:integer">
-			<!-- Data Operation -->
-			<xs:enumeration value="1" />
-			<!-- Storage based -->
-			<xs:enumeration value="2" />
-			<!-- Timer Based -->
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="statsRuleStatusType">
-		<xs:restriction base="xs:integer">
-			<!-- Active -->
-			<xs:enumeration value="1" />
-			<!-- Inactive -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="statModelType">
-		<xs:restriction base="xs:integer">
-			<!-- Event Based -->
-			<xs:enumeration value="1" />
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="encodingType">
-		<xs:restriction base="xs:integer">
-			<!-- Plain -->
-			<xs:enumeration value="0" />
-			<!-- base64String -->
-			<xs:enumeration value="1" />
-			<!-- base64Binary -->
-			<xs:enumeration value="2" />
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<!-- access control operations -->
-    <xs:simpleType name="accessControlOperations">
-        <xs:annotation>
-            <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:integer">
-            <!-- Create -->
-            <xs:enumeration value="1"/>
-            <!-- Retrieve -->
-            <xs:enumeration value="2"/>
-            <!-- Create + Retrieve -->
-            <xs:enumeration value="3"/>
-            <!-- Update -->
-            <xs:enumeration value="4"/>
-            <!-- Create + Update -->
-            <xs:enumeration value="5"/>
-            <!-- Retrieve + Update -->
-            <xs:enumeration value="6"/>
-            <!-- Create + Retrieve + Update -->
-            <xs:enumeration value="7"/>
-            <!-- Delete -->
-            <xs:enumeration value="8"/>
-            <!-- Create + Delete -->
-            <xs:enumeration value="9"/>
-            <!-- Retrieve + Delete -->
-            <xs:enumeration value="10"/>
-            <!-- Create + Retrieve + Delete -->
-            <xs:enumeration value="11"/>
-            <!-- Update + Delete -->
-            <xs:enumeration value="12"/>
-            <!-- Create + Update + Delete -->
-            <xs:enumeration value="13"/>
-            <!-- Retrieve + Update + Delete -->
-            <xs:enumeration value="14"/>
-            <!-- Create + Retrieve + Update + Delete -->
-            <xs:enumeration value="15"/>
-            <!-- Notify -->
-            <xs:enumeration value="16"/>
-            <!-- Create + Notify -->
-            <xs:enumeration value="17"/>
-            <!-- Retrieve + Notify -->
-            <xs:enumeration value="18"/>
-            <!-- Create + Retrieve + Notify -->
-            <xs:enumeration value="19"/>
-            <!-- Update + Notify -->
-            <xs:enumeration value="20"/>
-            <!-- Create + Update + Notify -->
-            <xs:enumeration value="21"/>
-            <!-- Retrieve + Update + Notify -->
-            <xs:enumeration value="22"/>
-            <!-- Create + Retrieve + Update -->
-            <xs:enumeration value="23"/>
-            <!-- Delete + Notify -->
-            <xs:enumeration value="24"/>
-            <!-- Create + Delete + Notify -->
-            <xs:enumeration value="25"/>
-            <!-- Retrieve + Delete + Notify -->
-            <xs:enumeration value="26"/>
-            <!-- Create + Retrieve + Delete + Notify -->
-            <xs:enumeration value="27"/>
-            <!-- Update + Delete + Notify -->
-            <xs:enumeration value="28"/>
-            <!-- Create + Update + Delete + Notify -->
-            <xs:enumeration value="29"/>
-            <!-- Retrieve + Update + Delete + Notify -->
-            <xs:enumeration value="30"/>
-            <!-- Create + Retrieve + Update + Delete + Notify -->
-            <xs:enumeration value="31"/>
-            <!-- Discover -->
-            <xs:enumeration value="32"/>
-            <!-- Create + Discover -->
-            <xs:enumeration value="33"/>
-            <!-- Retrieve + Discover -->
-            <xs:enumeration value="34"/>
-            <!-- Create + Retrieve + Discover -->
-            <xs:enumeration value="35"/>
-            <!-- Update + Discover -->
-            <xs:enumeration value="36"/>
-            <!-- Create + Update + Discover -->
-            <xs:enumeration value="37"/>
-            <!-- Retrieve + Update + Discover -->
-            <xs:enumeration value="38"/>
-            <!-- Create + Retrieve + Update + Discover -->
-            <xs:enumeration value="39"/>
-            <!-- Delete + Discover -->
-            <xs:enumeration value="40"/>
-            <!-- Create + Delete + Discover -->
-            <xs:enumeration value="41"/>
-            <!-- Retrieve + Delete + Discover -->
-            <xs:enumeration value="42"/>
-            <!-- Create + Retrieve + Delete + Discover -->
-            <xs:enumeration value="43"/>
-            <!-- Update + Delete + Discover -->
-            <xs:enumeration value="44"/>
-            <!-- Create + Update + Delete + Discover -->
-            <xs:enumeration value="45"/>
-            <!-- Retrieve + Update + Delete + Discover -->
-            <xs:enumeration value="46"/>
-            <!-- Create + Retrieve + Update + Delete + Discover -->
-            <xs:enumeration value="47"/>
-            <!-- Notify + Discover -->
-            <xs:enumeration value="48"/>
-            <!-- Create + Notify + Discover -->
-            <xs:enumeration value="49"/>
-            <!-- Retrieve + Notify + Discover -->
-            <xs:enumeration value="50"/>
-            <!-- Create + Retrieve + Notify + Discover -->
-            <xs:enumeration value="51"/>
-            <!-- Update + Notify + Discover -->
-            <xs:enumeration value="52"/>
-            <!-- Create + Update + Notify + Discover -->
-            <xs:enumeration value="53"/>
-            <!-- Retrieve + Update + Notify + Discover -->
-            <xs:enumeration value="54"/>
-            <!-- Create + Retrieve + Update + Discover -->
-            <xs:enumeration value="55"/>
-            <!-- Delete + Notify + Discover -->
-            <xs:enumeration value="56"/>
-            <!-- Create + Delete + Notify + Discover -->
-            <xs:enumeration value="57"/>
-            <!-- Retrieve + Delete + Notify + Discover -->
-            <xs:enumeration value="58"/>
-            <!-- Create + Retrieve + Delete + Notify + Discover -->
-            <xs:enumeration value="59"/>
-            <!-- Update + Delete + Notify + Discover -->
-            <xs:enumeration value="60"/>
-            <!-- Create + Update + Delete + Notify + Discover -->
-            <xs:enumeration value="61"/>
-            <!-- Retrieve + Update + Delete + Notify + Discover -->
-            <xs:enumeration value="62"/>
-            <!-- Create + Retrieve + Update + Delete + Notify + Discover -->
-            <xs:enumeration value="63"/>
-        </xs:restriction>
-    </xs:simpleType>
-    
-    <xs:simpleType name="SRole-ID">
-        <xs:restriction base="xs:token">
-            <!-- Software Management -->
-            <xs:enumeration value="01-001" />
-            <!-- Device Configuration -->
-            <xs:enumeration value="02-001" />
-            <!-- Device Diagnostics and Management -->
-            <xs:enumeration value="02-002" />
-            <!-- Device Firmware Management -->
-            <xs:enumeration value="02-003" />
-            <!-- Device Topology -->
-            <xs:enumeration value="02-004" />
-            <!-- Location -->
-            <xs:enumeration value="03-001" />
-            <!-- Basic Data -->
-            <xs:enumeration value="04-001" />
-            <!-- Onboarding -->
-            <xs:enumeration value="05-001" />
-            <!-- Security Administration -->
-            <xs:enumeration value="06-001" />
-            <!-- Groups Management -->
-            <xs:enumeration value="07-001" />
-            <!-- Event Collection -->
-            <xs:enumeration value="08-001" />
-        </xs:restriction>
-    </xs:simpleType>
-    
-    <xs:simpleType name="filterUsage">
-        <xs:annotation>
-            <xs:documentation>Used in filterCriteria</xs:documentation>
-        </xs:annotation>
-        <xs:restriction base="xs:integer">
-            <!-- Discovery Criteria -->
-            <xs:enumeration value="1" />
-            <!-- Event Notification Criteria -->
-            <xs:enumeration value="2" />
-        </xs:restriction>
-    </xs:simpleType>
-</xs:schema>
-
diff --git a/v1_0_0/CDT-eventConfig-v1_0_0.xsd b/v1_0_0/CDT-eventConfig-v1_0_0.xsd
deleted file mode 100644
index 3a9abd4f99d43153e0e29c04d4856c8f4a62d5f9..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-eventConfig-v1_0_0.xsd
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="eventConfig">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="creator" type="m2m:ID" />
-						<xs:element name="eventID" type="xs:string" />
-						<xs:element name="eventType" type="m2m:eventType" />
-						<xs:element name="eventStart" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="eventEnd" type="m2m:timestamp" minOccurs="0" />
-						<xs:element name="operationType" minOccurs="0">
-							<xs:simpleType>
-								<xs:list itemType="m2m:operation" />
-							</xs:simpleType>
-						</xs:element>
-						<xs:element name="dataSize" type="xs:nonNegativeInteger" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-eventLog-v1_0_0.xsd b/v1_0_0/CDT-eventLog-v1_0_0.xsd
deleted file mode 100644
index 240f58295dd73d8f7f04dee9f2b54052cff0ed18..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-eventLog-v1_0_0.xsd
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="eventLog">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="logTypeId" type="m2m:logTypeId" />
-						<xs:element name="logData" type="xs:string" />
-						<xs:element name="logStatus" type="m2m:logStatus" />
-						<xs:element name="logStart" type="xs:boolean" />
-						<xs:element name="logStop" type="xs:boolean" />
-          
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element> 	
-	
-	<xs:element name="eventLogAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="logTypeId" type="m2m:logTypeId" minOccurs="0" />
-						<xs:element name="logData" type="xs:string" minOccurs="0" />
-						<xs:element name="logStatus" type="m2m:logStatus" minOccurs="0"  />
-						<xs:element name="logStart" type="xs:boolean" minOccurs="0" />
-						<xs:element name="logStop" type="xs:boolean" minOccurs="0" />
-          
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element> 	
-</xs:schema>
diff --git a/v1_0_0/CDT-execInstance-v1_0_0.xsd b/v1_0_0/CDT-execInstance-v1_0_0.xsd
deleted file mode 100644
index 309bab91efbf87f45fa1776e0a6fbf5a05316852..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-execInstance-v1_0_0.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="execInstance">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-              			<xs:element name="execStatus" type="m2m:execStatusType" />
-						<xs:element name="execResult" type="m2m:execResultType" />
-						<xs:element name="execDisable" type="xs:boolean" minOccurs="0" />
-						<xs:element name="execTarget" type="m2m:nodeID" />
-						<xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
-						<xs:element name="execFrequency" type="xs:duration" minOccurs="0" />
-						<xs:element name="execDelay" type="xs:duration" minOccurs="0" />
-						<xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="execReqArgs" type="m2m:execReqArgsListType" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-firmware-v1_0_0.xsd b/v1_0_0/CDT-firmware-v1_0_0.xsd
deleted file mode 100644
index 8ce8d681c25d38c02c2a8ecfad52ac6addc7fb74..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-firmware-v1_0_0.xsd
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="firmware">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="version" type="xs:string" />
-						<xs:element name="name" type="xs:string" />
-						<xs:element name="URL" type="xs:anyURI" />
-						<xs:element name="update" type="xs:boolean" />
-						<xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />
-            
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="firmwareAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="version" type="xs:string" minOccurs="0" />
-						<xs:element name="name" type="xs:string" minOccurs="0" />
-						<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="update" type="xs:boolean" minOccurs="0" />
-						<xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />
-            
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-group-v1_0_0.xsd b/v1_0_0/CDT-group-v1_0_0.xsd
deleted file mode 100644
index 574b8228e23d74ccb51f14691ddef40a80e2d3cc..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-group-v1_0_0.xsd
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="group">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>					
-                        <xs:element name="creator" type="m2m:ID" minOccurs="0" />					
-						<xs:element name="memberType" type="m2m:memberType" />
-						<!-- TODO: data type xs:integer is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (TS-0004 to be corrected) -->
-						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
-						<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" />
-						<xs:element name="memberIDs" type="m2m:listOfURIs" />
-						<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="memberTypeValidated" type="xs:boolean" />
-						<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
-						<xs:element name="groupName" type="xs:string" minOccurs="0" />
-						
-						<!-- Child Resources -->
-						<xs:element name="fanOutPoint" type="xs:anyURI" />
-
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="groupAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
-						<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
-						<!-- TODO: data type xs:integer is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (TS-0004 to be corrected) -->
-						<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="memberIDs" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
-						<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0" />
-						<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
-						<xs:element name="groupName" type="xs:string" minOccurs="0" />
-						
-					    <!-- Child Resources -->
-     
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-                            <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-                        </xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-locationPolicy-v1_0_0.xsd b/v1_0_0/CDT-locationPolicy-v1_0_0.xsd
deleted file mode 100644
index d35d7728adecdeccd25bfe17c69cf5abac17b518..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-locationPolicy-v1_0_0.xsd
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="locationPolicy">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="locationSource" type="m2m:locationSource" />
-						<xs:element name="locationUpdatePeriod" type="xs:duration" minOccurs="0" />
-						<xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
-						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
-						<!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1-3 of TS-0004 needs to be corrected -->
-						<xs:element name="locationStatus" type="m2m:status" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription"></xs:element>
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="locationPolicyAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
-						<xs:element name="locationUpdatePeriod" type="xs:duration" minOccurs="0" />
-						<xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
-						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
-						<!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1-3 of TS-0004 needs to be corrected -->
-						<xs:element name="locationStatus" type="m2m:status" minOccurs="0" />
-
-						<!-- No Child Resources -->
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/v1_0_0/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd b/v1_0_0/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd
deleted file mode 100644
index f8752e1e7b6f73152635ba936ad5ae8edd29ca29..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-serviceSubscribedNode-v1_0_0.xsd" />
-
-	<xs:element name="m2mServiceSubscriptionProfile">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="serviceRoles" minOccurs="0">
-							<xs:simpleType>
-								<xs:list itemType="m2m:SRole-ID" />
-							</xs:simpleType>
-						</xs:element>
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:serviceSubscribedNode" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-memory-v1_0_0.xsd b/v1_0_0/CDT-memory-v1_0_0.xsd
deleted file mode 100644
index ad1a8a8d465a8290b3cb927907d0539214134786..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-memory-v1_0_0.xsd
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="memory">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="memAvailable" type="xs:unsignedLong" />
-						<xs:element name="memTotal" type="xs:unsignedLong" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="memoryAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="memAvailable" type="xs:unsignedLong" minOccurs="0" />
-						<xs:element name="memTotal" type="xs:unsignedLong" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-mgmtCmd-v1_0_0.xsd b/v1_0_0/CDT-mgmtCmd-v1_0_0.xsd
deleted file mode 100644
index aafb610dd532e8e2cca1d871e4a0c3b8c0283a4d..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-mgmtCmd-v1_0_0.xsd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-execInstance-v1_0_0.xsd" />
-
-	<xs:element name="mgmtCmd">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="description" type="xs:string" minOccurs="0" />
-						<xs:element name="cmdType" type="m2m:cmdType" />
-						<xs:element name="execReqArgs" type="m2m:execReqArgsListType" minOccurs="0" />
-						<xs:element name="execEnable" type="xs:boolean" />
-						<xs:element name="execTarget" type="m2m:nodeID" />
-						<xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
-						<xs:element name="execFrequency" type="xs:duration" minOccurs="0" />
-						<xs:element name="execDelay" type="xs:duration" minOccurs="0" />
-						<xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="1" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:execInstance" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-node-v1_0_0.xsd b/v1_0_0/CDT-node-v1_0_0.xsd
deleted file mode 100644
index a7d104309dc5d9da053cf859d2e645a4dbd061ad..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-node-v1_0_0.xsd
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-memory-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-battery-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkInfo-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-firmware-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-software-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceInfo-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-deviceCapability-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-reboot-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-eventLog-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-cmdhPolicy-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-activeCmdhPolicy-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="node">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="nodeID" type="m2m:nodeID" />
-						<xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:memory" />
-								<xs:element ref="m2m:battery" />
-								<xs:element ref="m2m:areaNwkInfo" />
-								<xs:element ref="m2m:areaNwkDeviceInfo" />
-								<xs:element ref="m2m:firmware" />
-								<xs:element ref="m2m:software" />
-								<xs:element ref="m2m:deviceInfo" />
-								<xs:element ref="m2m:deviceCapability" />
-								<xs:element ref="m2m:reboot" />
-								<xs:element ref="m2m:eventLog" />
-								<xs:element ref="m2m:cmdhPolicy" />
-								<xs:element ref="m2m:activeCmdhPolicy" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	   <xs:element name="nodeAnnc">
-        <xs:complexType>
-            <xs:complexContent>
-                <!-- Inherit common attributes for announceable Resources -->
-                <xs:extension base="m2m:announceableResource">
-                    <!-- Resource Specific Attributes -->
-                    <xs:sequence>
-                        <xs:element name="nodeID" type="m2m:nodeID" />
-                        <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
-
-                        <!-- Child Resources -->
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element ref="m2m:memoryAnnc" />
-                                <xs:element ref="m2m:batteryAnnc" />
-                                <xs:element ref="m2m:areaNwkInfoAnnc" />
-                                <xs:element ref="m2m:areaNwkDeviceInfoAnnc" />
-                                <xs:element ref="m2m:firmwareAnnc" />
-                                <xs:element ref="m2m:softwareAnnc" />
-                                <xs:element ref="m2m:deviceInfoAnnc" />
-                                <xs:element ref="m2m:deviceCapabilityAnnc" />
-                                <xs:element ref="m2m:rebootAnnc" />
-                                <xs:element ref="m2m:eventLogAnnc" />
-                                <xs:element ref="m2m:subscription" />
-                            </xs:choice>
-                        </xs:choice>
-                    </xs:sequence>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-notification-v1_0_0.xsd b/v1_0_0/CDT-notification-v1_0_0.xsd
deleted file mode 100644
index f3cc4578ca6a053fb2bd522d40b9eda1ad7f210b..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-notification-v1_0_0.xsd
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
-The copyright and the foregoing restriction extend to reproduction in all media.
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://www.onem2m.org/xml/protocols"
-        xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
-        xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd"/>
-    <xs:include schemaLocation="CDT-responsePrimitive-v1_0_0.xsd"/>
-
-
-        <xs:element name="notification" type="m2m:notification" />      
-
-        <xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" />
-
-        <xs:complexType name="aggregatedNotification">
-                <xs:sequence>
-                        <xs:element name="notification" type="m2m:notification" minOccurs="0" maxOccurs="unbounded"/>
-                </xs:sequence>
-        </xs:complexType>
-
-        <xs:complexType name="notification">
-                <xs:sequence>
-                        <xs:element name="notificationEvent" minOccurs="0">
-                            <xs:complexType >
-                                <xs:sequence>
-                                      <xs:element name="representation" type="xs:anyType" minOccurs="0"/>
-                                      <xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/>
-                                      <xs:element name="operationMonitor" minOccurs="0">
-                                          <xs:complexType>
-                                               <xs:sequence>
-                                                   <xs:element name="operation" type="m2m:operation" minOccurs="0"/>
-                                                   <xs:element name="originator" type="m2m:ID" minOccurs="0"/>
-                                               </xs:sequence>
-                                         </xs:complexType>
-                                      </xs:element>
-                                </xs:sequence>
-                            </xs:complexType>
-                        </xs:element>                      
-                        <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
-                        <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
-                        <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
-                        <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
-                </xs:sequence>
-        </xs:complexType>
-
-</xs:schema>
diff --git a/v1_0_0/CDT-pollingChannel-v1_0_0.xsd b/v1_0_0/CDT-pollingChannel-v1_0_0.xsd
deleted file mode 100644
index 6fb3d668f344f374811701c7047ef090644a0926..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-pollingChannel-v1_0_0.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="pollingChannel">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- No Resource Specific Attributes -->
-
-						<!-- Virtual Child Resource -->
-						<xs:element name="pollingChannelURI" type="xs:anyURI" />
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-reboot-v1_0_0.xsd b/v1_0_0/CDT-reboot-v1_0_0.xsd
deleted file mode 100644
index e8e58542f9209255ad8a8c3d8bffa662976f30e1..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-reboot-v1_0_0.xsd
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="reboot">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="reboot" type="xs:boolean" />
-						<xs:element name="factoryReset" type="xs:boolean" />
-              
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="rebootAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="reboot" type="xs:boolean" minOccurs="0" />
-						<xs:element name="factoryReset" type="xs:boolean" minOccurs="0" />
-              
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-remoteCSE-v1_0_0.xsd b/v1_0_0/CDT-remoteCSE-v1_0_0.xsd
deleted file mode 100644
index bced1c294faf1d14a1837683499e83954efa33b3..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-remoteCSE-v1_0_0.xsd
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-
-	<xs:include schemaLocation="CDT-AE-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-pollingChannel-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-node-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />
-
-	<xs:element name="remoteCSE">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announceable Resources -->
-				<xs:extension base="m2m:announceableResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" />
-						<xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" />
-						<xs:element name="CSEBase" type="xs:anyURI" />
-						<xs:element name="CSE-ID" type="m2m:ID" />
-						<xs:element name="M2M-Ext-ID" type="m2m:externalID" minOccurs="0" />
-						<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" />
-						<xs:element name="requestReachability" type="xs:boolean" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-						
-	                    <!-- Child Resources -->
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element ref="m2m:AE" />
-                                <xs:element ref="m2m:container" />
-                                <xs:element ref="m2m:group" />
-                                <xs:element ref="m2m:accessControlPolicy" />
-                                <xs:element ref="m2m:subscription" />
-                                <xs:element ref="m2m:pollingChannel" />
-                                <xs:element ref="m2m:schedule" />
-                            </xs:choice>
-                        </xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="remoteCSEAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes for announced Resources -->
-				<xs:extension base="m2m:announcedResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" />
-						<xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" />
-						<xs:element name="CSEBase" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="CSE-ID" type="m2m:ID" minOccurs="0" />
-						<xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
-						<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
-                       
-                        <!-- Child Resources -->
-                        <xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element ref="m2m:nodeAnnc" />
-                                <xs:element ref="m2m:AE" />
-                                <xs:element ref="m2m:AEAnnc" />
-                                <xs:element ref="m2m:container" />
-                                <xs:element ref="m2m:containerAnnc" />
-                                <xs:element ref="m2m:group" />
-                                <xs:element ref="m2m:groupAnnc" />
-                                <xs:element ref="m2m:accessControlPolicy" />
-                                <xs:element ref="m2m:accessControlPolicyAnnc" />
-                                <xs:element ref="m2m:subscription" />
-                                <xs:element ref="m2m:pollingChannel" />
-                                <xs:element ref="m2m:scheduleAnnc" />
-                                <xs:element ref="m2m:locationPolicyAnnc" />
-                            </xs:choice>
-                        </xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-request-v1_0_0.xsd b/v1_0_0/CDT-request-v1_0_0.xsd
deleted file mode 100644
index 5156d7f41531ef608fee9c0fdaacdcc1a47915f9..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-request-v1_0_0.xsd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="request">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
-						<xs:element name="operation" type="m2m:operation" />
-						<xs:element name="target" type="xs:anyURI" />
-						<xs:element name="originator" type="m2m:ID" />
-						<xs:element name="requestID" type="m2m:requestID" />
-						<xs:element name="metaInformation" type="m2m:metaInformation" />
-						<xs:element name="content" type="m2m:primitiveContent" />
-						<xs:element name="requestStatus" type="m2m:requestStatus" />
-						<xs:element name="operationResult" type="m2m:operationResult" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription"></xs:element>
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/v1_0_0/CDT-requestPrimitive-v1_0_0.xsd b/v1_0_0/CDT-requestPrimitive-v1_0_0.xsd
deleted file mode 100644
index a5fdce68aefc67b1c18b8f47cc64860e3cbdec61..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-requestPrimitive-v1_0_0.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-
-    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-
-    <xs:element name="requestPrimitive" >
-      <xs:complexType>
-        <xs:sequence>
-          <!-- parameter "Operation"  -->
-          <xs:element name="operation" type="m2m:operation" minOccurs="1"/>
-          <!-- parameter "To" -->
-          <xs:element name="to" type="xs:anyURI" minOccurs="1"/>
-          <!-- parameter "From" -->
-          <xs:element name="from" type="m2m:ID" minOccurs="1"/>
-          <!-- parameter "Request Identifier" -->
-          <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> 
-          <!-- parameter "ResourceType" -->
-          <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
-          <!-- parameter "Name" -->
-          <xs:element name="name" type="xs:string" minOccurs="0"/>
-          <!-- parameter "Content" (of the primitive)-->
-          <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/> 
-          <!-- parameter "Originating Timestamp" -->
-          <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Request Expiration Timestamp" -->
-          <xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Result Expiration Timestamp" -->
-          <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Operation Execution Time" -->
-          <xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Response Type" -->
-          <xs:element name="responseType" type="m2m:resourceType" minOccurs="0"/>
-          <!-- parameter "Result Persistence" -->
-          <xs:element name="resultPersistence" type="xs:duration" minOccurs="0"/>
-          <!-- parameter "Result Content" -->
-          <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
-          <!-- parameter "Event Category" -->
-          <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
-          <!-- parameter "Delivery Aggregation" -->
-          <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
-          <!-- parameter "Group Request Identifier" -->
-          <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>        
-          <!-- parameter "Filter Criteria" -->
-          <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
-          <!-- parameter "Discovery Result Type" -->
-          <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
-        </xs:sequence> 	       
-      </xs:complexType>
-    </xs:element>
-  
-    <xs:element name="attributeList" type="m2m:attributeList"  />
-  
-</xs:schema> 
-
diff --git a/v1_0_0/CDT-requestPrimitive-v1_0_1.xsd b/v1_0_0/CDT-requestPrimitive-v1_0_1.xsd
deleted file mode 100644
index b2bf4e38b72009776dff1ddb0e8b1d8e37158498..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-requestPrimitive-v1_0_1.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-
-    <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-
-    <xs:element name="requestPrimitive" >
-      <xs:complexType>
-        <xs:sequence>
-          <!-- parameter "Operation"  -->
-          <xs:element name="operation" type="m2m:operation" minOccurs="1"/>
-          <!-- parameter "To" -->
-          <xs:element name="to" type="xs:anyURI" minOccurs="1"/>
-          <!-- parameter "From" -->
-          <xs:element name="from" type="m2m:ID" minOccurs="1"/>
-          <!-- parameter "Request Identifier" -->
-          <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> 
-          <!-- parameter "ResourceType" -->
-          <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
-          <!-- parameter "Name" -->
-          <xs:element name="name" type="xs:string" minOccurs="0"/>
-          <!-- parameter "Content" (of the primitive)-->
-          <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/> 
-          <!-- parameter "Originating Timestamp" -->
-          <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Request Expiration Timestamp" -->
-          <xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Result Expiration Timestamp" -->
-          <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Operation Execution Time" -->
-          <xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Response Type" -->
-          <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0"/>
-          <!-- parameter "Result Persistence" -->
-          <xs:element name="resultPersistence" type="xs:duration" minOccurs="0"/>
-          <!-- parameter "Result Content" -->
-          <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
-          <!-- parameter "Event Category" -->
-          <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
-          <!-- parameter "Delivery Aggregation" -->
-          <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
-          <!-- parameter "Group Request Identifier" -->
-          <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>        
-          <!-- parameter "Filter Criteria" -->
-          <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
-          <!-- parameter "Discovery Result Type" -->
-          <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
-        </xs:sequence> 	       
-      </xs:complexType>
-    </xs:element>
-  
-    <xs:element name="attributeList" type="m2m:attributeList"  />
-  
-</xs:schema> 
-
diff --git a/v1_0_0/CDT-responsePrimitive-v1_0_0.xsd b/v1_0_0/CDT-responsePrimitive-v1_0_0.xsd
deleted file mode 100644
index 6f78e01bc43f4e50a5ac3eb0394661c97640cc92..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-responsePrimitive-v1_0_0.xsd
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience 
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards 
-and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, 
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 	
-      targetNamespace="http://www.onem2m.org/xml/protocols" 
-      xmlns:m2m="http://www.onem2m.org/xml/protocols"
-      elementFormDefault="unqualified" attributeFormDefault="unqualified" >   
-
-  <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" /> 
-
-  <xs:element name="responsePrimitive" >
-      <xs:complexType>
-        <xs:sequence>
-          <!-- Response Code and Status Code primitive parameters defined in TS-0001 have been merged into
-               Response Status Code  in TS-0004 -->
-          <!-- parameter "Response Status Code" -->
-          <xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
-          <!-- parameter "Request Identifier" -->
-          <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> 
-          <!-- parameter "Content" (of the primitive) -->
-          <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
-          <!-- parameter "To" -->
-          <xs:element name="to" type="m2m:ID" minOccurs="0"/>
-          <!-- parameter "From" -->
-          <xs:element name="from" type="m2m:ID" minOccurs="0"/>
-          <!-- parameter "Originating Timestamp" -->
-          <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Result Expiration Timestamp" -->
-          <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
-          <!-- parameter "Event Category" -->
-          <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
-        </xs:sequence> 	       
-      </xs:complexType>
-    </xs:element>
-  
-  <xs:element name="resource" type="m2m:resourceWrapper"  />
-  
-  <xs:element name="URIlist" type="m2m:listOfURIs"  />
- 
-  <xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
-  
-  
-  <xs:complexType name="aggregatedResponse">    
-    <xs:sequence>      
-      <xs:element ref="m2m:responsePrimitive" minOccurs="1" maxOccurs="unbounded"/>      
-    </xs:sequence> 	       
-  </xs:complexType> 
-  
-  
-</xs:schema> 
-
diff --git a/v1_0_0/CDT-schedule-v1_0_0.xsd b/v1_0_0/CDT-schedule-v1_0_0.xsd
deleted file mode 100644
index 7dbcc8d3d516ca6b6f22ddd4ba38c1335b3ad660..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-schedule-v1_0_0.xsd
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="schedule">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announceableSubordinateResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="scheduleElement" type="m2m:scheduleEntries"  />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:subscription"></xs:element>
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:element name="scheduleAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="m2m:announcedSubordinateResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/v1_0_0/CDT-serviceSubscribedAppRule-v1_0_0.xsd b/v1_0_0/CDT-serviceSubscribedAppRule-v1_0_0.xsd
deleted file mode 100644
index defabfe3df8c9ed9342f44d6c18528bd6cf1200a..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-serviceSubscribedAppRule-v1_0_0.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="serviceSubscribedAppRule">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="applicableCredIDs" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="allowedApp-IDs" type="m2m:listOfM2MID" minOccurs="0" />
-						<xs:element name="allowedAEs" type="m2m:listOfM2MID" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-serviceSubscribedNode-v1_0_0.xsd b/v1_0_0/CDT-serviceSubscribedNode-v1_0_0.xsd
deleted file mode 100644
index 5dbe4a396a8e06e04600ea3290374c54844d6763..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-serviceSubscribedNode-v1_0_0.xsd
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="serviceSubscribedNode">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="nodeID" type="m2m:nodeID" />
-						<xs:element name="CSE-ID" type="m2m:ID" minOccurs="0" />
-						<xs:element name="deviceIdentifier" minOccurs="0">
-							<xs:simpleType>
-								<xs:list itemType="m2m:deviceID" />
-							</xs:simpleType>
-						</xs:element>
-                        <xs:element name="ruleLinks" type="m2m:listOfURIs" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-software-v1_0_0.xsd b/v1_0_0/CDT-software-v1_0_0.xsd
deleted file mode 100644
index 8e5982703f0389543b82e640c678486c53a8a553..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-software-v1_0_0.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" 
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-	
-	<xs:element name="software">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "mgmtResource" -->
-				<xs:extension base="m2m:mgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="version" type="xs:string" />
-						<xs:element name="name" type="xs:string" />
-						<xs:element name="URL" type="xs:anyURI" />
-						<xs:element name="install" type="xs:boolean" minOccurs="0" />
-						<xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
-						<xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
-						<xs:element name="activate" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
-              
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="softwareAnnc">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
-				<xs:extension base="m2m:announcedMgmtResource">
-					<!-- Resource Specific Attributes -->
-					<xs:sequence>
-						<xs:element name="version" type="xs:string" minOccurs="0" />
-						<xs:element name="name" type="xs:string" minOccurs="0" />
-						<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="install" type="xs:boolean" minOccurs="0" />
-						<xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
-						<xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
-						<xs:element name="activate" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
-						<xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
-              
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-statsCollect-v1_0_0.xsd b/v1_0_0/CDT-statsCollect-v1_0_0.xsd
deleted file mode 100644
index 8a13bf9f8a239dbf289ce669968d341bc9399c9e..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-statsCollect-v1_0_0.xsd
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="statsCollect">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="creator" type="m2m:ID" />
-						<xs:element name="statsCollectID" type="xs:string" />
-						<xs:element name="collectingEntityID" type="m2m:ID" />
-                        <xs:element name="collectedEntityID" type="m2m:ID" />						
-						<xs:element name="statsRuleStatus" type="m2m:statsRuleStatusType" />
-						<xs:element name="statModel" type="m2m:statModelType" />
-						<xs:element name="collectPeriod" type="m2m:scheduleEntries" minOccurs="0" />
-                        <xs:element name="eventID" type="xs:string" minOccurs="0" />
-                        
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-							<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-statsConfig-v1_0_0.xsd b/v1_0_0/CDT-statsConfig-v1_0_0.xsd
deleted file mode 100644
index 97ea1fbfac2adda857bc25f83d3eb68a279c003c..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-statsConfig-v1_0_0.xsd
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-eventConfig-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
-
-	<xs:element name="statsConfig">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="creator" type="m2m:ID" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
-							<xs:choice minOccurs="1" maxOccurs="unbounded">
-								<xs:element ref="m2m:eventConfig" />
-								<xs:element ref="m2m:subscription" />
-							</xs:choice>
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/v1_0_0/CDT-subscription-v1_0_0.xsd b/v1_0_0/CDT-subscription-v1_0_0.xsd
deleted file mode 100644
index 2a99d887583fb586b2985fa732fe390669e0fe54..0000000000000000000000000000000000000000
--- a/v1_0_0/CDT-subscription-v1_0_0.xsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
-contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
-© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-
-Notice of Disclaimer & Limitation of Liability 
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand 
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. 
-No recommendation as to products or vendors is made or should be implied. 
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
-	xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
-	<xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
-
-	<xs:element name="subscription">
-		<xs:complexType>
-			<xs:complexContent>
-				<!-- Inherit common attributes from RegularResource Type -->
-				<xs:extension base="m2m:regularResource">
-					<xs:sequence>
-						<!-- Resource Specific Attributes -->
-						<xs:element name="eventNotificationCriteria" type="m2m:eventNotificationCriteria" minOccurs="0" />
-						<xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="notificationURI" type="m2m:listOfURIs" />
-						<xs:element name="groupID" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0" />
-						<xs:element name="batchNotify" type="m2m:batchNotify" minOccurs="0" />
-						<xs:element name="rateLimit" type="m2m:rateLimit" minOccurs="0" />
-						<xs:element name="preSubscriptionNotify" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="pendingNotification" type="m2m:pendingNotification" minOccurs="0" />
-						<xs:element name="notificationStoragePriority" type="xs:positiveInteger" minOccurs="0" />
-						<xs:element name="latestNotify" type="xs:boolean" minOccurs="0" />
-						<xs:element name="notificationContentType" type="m2m:notificationContentType" />
-						<xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
-						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-						<xs:element name="subscriberURI" type="xs:anyURI" minOccurs="0" />
-
-						<!-- Child Resources -->
-						<xs:choice minOccurs="0" maxOccurs="1">
-							<xs:element name="childResource" type="m2m:childResourceRef" />
-							<xs:element ref="m2m:schedule" />
-						</xs:choice>
-					</xs:sequence>
-				</xs:extension>
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:complexType name="eventNotificationCriteria">
-		<xs:sequence>
-			<xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="unbounded" />
-			<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="batchNotify">
-		<xs:sequence>
-			<xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="duration" type="xs:duration" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:complexType name="rateLimit">
-		<xs:sequence>
-			<xs:element name="maxNrOfNotify" type="xs:nonNegativeInteger" minOccurs="0" />
-			<xs:element name="timeWindow" type="xs:duration" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
-
-</xs:schema>