diff --git a/LibCommon/LibCommon_DataStrings.ttcn b/LibCommon/LibCommon_DataStrings.ttcn
index 66726e68d85bb156c1987b7a3241158c5bc3ddfa..1c2d4c4349abbc46d49a396ea654cf37624f6274 100644
--- a/LibCommon/LibCommon_DataStrings.ttcn
+++ b/LibCommon/LibCommon_DataStrings.ttcn
@@ -2,7 +2,7 @@
  *
  *  @author   ETSI
  *  @version  $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_DataStrings.ttcn $
- *            $Id: LibCommon_DataStrings.ttcn 58 2014-10-03 06:04:49Z garciay $
+ *            $Id: LibCommon_DataStrings.ttcn 61 2016-08-24 13:29:29Z garciay $
  *  @desc     A collection of data string type and value definitions which
  *            may be useful in the implementation of any TTCN-3 test
  *            suite. "Data string" refers to TTCN-3 hexstring, octetstring
@@ -60,6 +60,7 @@
 	type bitstring  Bit72   length(72) with {encode "length(72)"};
     type bitstring  Bit128  length(128) with {encode "length(128)"};
     type bitstring  Bit144  length(144) with {encode "length(144)"};
+    type bitstring  Bit256  length(256) with {encode "length(256)"};
 
   } // end group bitStringSubTypes
 
diff --git a/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
similarity index 96%
rename from OneM2M_Functions.ttcn
rename to LibOneM2M/OneM2M_Functions.ttcn
index e795c2e7e5e4f9e80fb70ad82d8d4491b621b20e..a98026ee079f2fe7680e9d860c504462ad5c5d91 100644
--- a/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -6,8 +6,8 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 101 2016-07-08 15:41:06Z reinaortega $
+ *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
+ *              $Id: OneM2M_Functions.ttcn 103 2016-08-30 09:39:32Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
diff --git a/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
similarity index 92%
rename from OneM2M_Pixits.ttcn
rename to LibOneM2M/OneM2M_Pixits.ttcn
index b9181a6d53b3e9bd6acda047733cb207f01d2258..ab9294b2e40afe9d7ebf22c28cf8646327e6d048 100644
--- a/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -6,8 +6,8 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Pixits.ttcn $
- *              $Id: OneM2M_Pixits.ttcn 99 2016-06-09 15:04:43Z reinaortega $
+ *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
+ *              $Id: OneM2M_Pixits.ttcn 103 2016-08-30 09:39:32Z reinaortega $
  *  @desc       Module containing Pixits for oneM2M
  *
  */
diff --git a/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
similarity index 96%
rename from OneM2M_Templates.ttcn
rename to LibOneM2M/OneM2M_Templates.ttcn
index 710889ae6f2b4652225b8626a2cdcc97c5e3303b..453c4f697ada39d05fdb1758a7c95c19790c49b4 100644
--- a/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -6,8 +6,8 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Templates.ttcn $
- *              $Id: OneM2M_Templates.ttcn 101 2016-07-08 15:41:06Z reinaortega $
+ *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
+ *              $Id: OneM2M_Templates.ttcn 103 2016-08-30 09:39:32Z reinaortega $
  *  @desc       Module containing templates for oneM2M
  *
  */
diff --git a/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
similarity index 92%
rename from OneM2M_TestSystem.ttcn
rename to LibOneM2M/OneM2M_TestSystem.ttcn
index 88fd633786ee16c11e69e24a7e3c8cb3b1f22256..f296e6862d7cc367e4374c53e9169d9bce0fed57 100644
--- a/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -6,8 +6,8 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestSystem.ttcn $
- *              $Id: OneM2M_TestSystem.ttcn 101 2016-07-08 15:41:06Z reinaortega $
+ *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
+ *              $Id: OneM2M_TestSystem.ttcn 103 2016-08-30 09:39:32Z reinaortega $
  *  @desc       Test System module for oneM2M
  *
  */
diff --git a/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
similarity index 96%
rename from OneM2M_Types.ttcn
rename to LibOneM2M/OneM2M_Types.ttcn
index 2f5ba92686ce06768f0f71b4c939211d95208398..26db6b9b13a77cd36a27bd8ed5b645160457da01 100644
--- a/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -6,8 +6,8 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Types.ttcn $
- *              $Id: OneM2M_Types.ttcn 101 2016-07-08 15:41:06Z reinaortega $
+ *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
+ *              $Id: OneM2M_Types.ttcn 103 2016-08-30 09:39:32Z reinaortega $
  *  @desc       Test System module for oneM2M
  *
  */
diff --git a/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
similarity index 100%
rename from OneM2M_TypesAndValues.ttcn
rename to LibOneM2M/OneM2M_TypesAndValues.ttcn
diff --git a/UsefulTtcn3Types.ttcn b/LibOneM2M/UsefulTtcn3Types.ttcn
similarity index 100%
rename from UsefulTtcn3Types.ttcn
rename to LibOneM2M/UsefulTtcn3Types.ttcn
diff --git a/XSD.ttcn b/LibOneM2M/XSD.ttcn
similarity index 100%
rename from XSD.ttcn
rename to LibOneM2M/XSD.ttcn
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index a9320abcb4aac8dc5a46606d7ccf5512a93a9a70..12967234fa35aa41e3a7a2d23983620da8f77830 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 101 2016-07-08 15:41:06Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 103 2016-08-30 09:39:32Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */