diff --git a/meta-1.1/entity/ilincs-compound.json b/meta-1.1/entity/ilincs-compound.json
deleted file mode 100755
index 36c1cb7..0000000
--- a/meta-1.1/entity/ilincs-compound.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/entity/ilincs-compound.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "Compound metadata as described by http://www.ilincs.org/ilincs.json",
-  "allOf": [
-    {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
-    },
-    {
-      "type": "object",
-      "properties": {
-        "pubchemcid": {
-          "type": "number",
-          "format": "double"
-        },
-        "stitchid": {
-          "type": "string"
-        },
-        "perturbagenid": {
-          "type": "string"
-        },
-        "compound": {
-          "type": "string"
-        },
-        "lincspertid": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "pubchemcid",
-        "stitchid",
-        "perturbagenid",
-        "compound",
-        "lincspertid"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/entity/ilincs-gene.json b/meta-1.1/entity/ilincs-gene.json
deleted file mode 100755
index 8fab148..0000000
--- a/meta-1.1/entity/ilincs-gene.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/entity/ilincs-gene.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "Gene metadata as described by http://www.ilincs.org/ilincs.json",
-  "allOf": [
-    {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
-    },
-    {
-      "type": "object",
-      "properties": {
-        "chromosome": {
-          "type": "string"
-        },
-        "dbxrefs": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string"
-        },
-        "geneid": {
-          "type": "number",
-          "format": "double"
-        },
-        "homologeneid": {
-          "type": "number",
-          "format": "double"
-        },
-        "locustag": {
-          "type": "string"
-        },
-        "maplocation": {
-          "type": "string"
-        },
-        "namenomauth": {
-          "type": "string"
-        },
-        "nomstatus": {
-          "type": "string"
-        },
-        "symbol": {
-          "type": "string"
-        },
-        "symbonomauth": {
-          "type": "string"
-        },
-        "synonyms": {
-          "type": "string"
-        },
-        "taxid": {
-          "type": "number",
-          "format": "double"
-        },
-        "typeofgene": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "geneid"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/library/ilincs.json b/meta-1.1/library/ilincs.json
deleted file mode 100755
index 3735f8c..0000000
--- a/meta-1.1/library/ilincs.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/entity/ilincs-library.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "Library metadata as described by http://www.ilincs.org/ilincs.json",
-  "allOf": [
-    {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
-    },
-    {
-      "type": "object",
-      "properties": {
-        "platform": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string"
-        },
-        "geolink": {
-          "type": "string"
-        },
-        "lincsDsgc": {
-          "type": "string"
-        },
-        "publink": {
-          "type": "string"
-        },
-        "pubmeddescription": {
-          "type": "string"
-        },
-        "experiment": {
-          "type": "string"
-        },
-        "assay": {
-          "type": "string"
-        },
-        "dataFormat": {
-          "type": "string"
-        },
-        "sampleType": {
-          "type": "string"
-        },
-        "dataType": {
-          "type": "string"
-        },
-        "organism": {
-          "type": "string"
-        },
-        "portal": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "description",
-        "geolink",
-        "publink",
-        "pubmeddescription",
-        "experiment"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/signature/ilincs.json b/meta-1.1/signature/ilincs.json
deleted file mode 100755
index 3919e5c..0000000
--- a/meta-1.1/signature/ilincs.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/ilincs.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "Signature metadata as described by http://www.ilincs.org/ilincs.json",
-  "allOf": [
-    {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
-    },
-    {
-      "type": "object",
-      "properties": {
-        "antibodytarget": {
-          "type": "string"
-        },
-        "cellline": {
-          "type": "string"
-        },
-        "cid": {
-          "type": "string"
-        },
-        "compound": {
-          "type": "string"
-        },
-        "concentration": {
-          "type": "string"
-        },
-        "concordancetable": {
-          "type": "string"
-        },
-        "datasetid": {
-          "type": "string"
-        },
-        "factor": {
-          "type": "string"
-        },
-        "level1": {
-          "type": "string"
-        },
-        "level2": {
-          "type": "string"
-        },
-        "libraryid": {
-          "type": "string"
-        },
-        "lincspertid": {
-          "type": "string"
-        },
-        "nCtrSamples": {
-          "type": "number",
-          "format": "double"
-        },
-        "nTrtSamples": {
-          "type": "number",
-          "format": "double"
-        },
-        "peaktype": {
-          "type": "string"
-        },
-        "platform": {
-          "type": "string"
-        },
-        "signatureid": {
-          "type": "string"
-        },
-        "time": {
-          "type": "string"
-        },
-        "treatment": {
-          "type": "string"
-        },
-        "perturbagenID": {
-          "type": "string"
-        },
-        "stitchID": {
-          "type": "string"
-        },
-        "pubChemID": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "signatureid"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/signature/l1000-fwd.json b/meta-1.1/signature/l1000-fwd.json
deleted file mode 100755
index 89412e0..0000000
--- a/meta-1.1/signature/l1000-fwd.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/l1000-fwd.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "Signature metadata as described by http://amp.pharm.mssm.edu/l1000fwd/api_page",
-  "allOf": [
-    {
-      "$ref": "/@dcic/signature-commons-schema/core/meta.json"
-    },
-    {
-      "type": "object",
-      "properties": {
-        "pert_time": {
-          "type": "integer",
-          "example": 24
-        },
-        "cell_id": {
-          "type": "string",
-          "example": "HA1E"
-        },
-        "mean_cosine_dist_centered_by_batch": {
-          "type": "number",
-          "example": 0.7235488042208277
-        },
-        "up_genes": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "batch": {
-          "type": "string",
-          "example": "CPC006_HA1E_24H"
-        },
-        "pvalue": { 
-          "type": "number",
-          "format": "float",
-          "example": 0.0
-        },
-        "pert_dose": {
-          "type": "number",
-          "format": "float",
-          "example": 40.0
-        },
-        "combined_genes": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "example": [
-            "HSPA2",
-            "ADD3"
-          ]
-        },
-        "pert_id": {
-          "type": "string",
-          "example": "BRD-A70155556"
-        },
-        "sig_id": {
-          "type": "string",
-          "example": "CPC006_HA1E_24H:BRD-A70155556-001-04-4:40"
-        },
-        "distil_id": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "example": [
-            "CPC006_HA1E_24H_X1.A2_B4_DUO52HI53LO:D24",
-            "CPC006_HA1E_24H_X1.A2_F1B3_DUO52HI53LO:D24"
-          ]
-        },
-        "down_genes": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "example": [
-            "SFTPD",
-            "HSPA2"
-          ]
-        },
-        "pert_desc": {
-          "type": "string",
-          "example": "NP-001236"
-        }
-      },
-      "required": [
-        "cell_id",
-        "batch",
-        "sig_id",
-        "distil_id"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/signature/pert.test.json b/meta-1.1/signature/pert.test.json
deleted file mode 100755
index 3f7dfd9..0000000
--- a/meta-1.1/signature/pert.test.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "$validator": "/@dcic/signature-commons-schema/core/examples.json",
-  "tests": [
-    {
-      "name": "Signature (Tissue)",
-      "valid": true,
-      "schema": "/@dcic/signature-commons-schema/core/signature.json",
-      "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/signature.json",
-        "id": "1",
-        "library": "0",
-        "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta-1.1/signature/draft-1.1.json",
-          "Perturbation_Type": "gene",
-          "Readout" : "mRNA",
-          "Number_of_genes": 0,
-          "Original_String": "some string",
-          "Organism": "Homo sapiens",
-          "Assay": "microarray",
-          "Tissue": [
-            {
-              "Name": "kidney"
-            }
-          ]
-        },
-        "entities": [
-          {
-            "entity": "2",
-            "value": 0.1
-          }
-        ]
-      }
-    },
-    {
-      "name": "Signature (CL)",
-      "valid": true,
-      "schema": "/@dcic/signature-commons-schema/core/signature.json",
-      "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/signature.json",
-        "id": "1",
-        "library": "0",
-        "meta": {
-          "$validator": "/@dcic/signature-commons-schema/meta-1.1/signature/draft-1.1.json",
-          "Readout" : "mRNA",
-          "Number_of_genes": 0,
-          "Perturbation_Type": "gene",
-          "Original_String": "some string",
-          "Organism": "Homo sapiens",
-          "Assay": "microarray",
-          "Organism": "Homo sapiens",
-          "Cell Line": [
-            {
-              "Name": "kidney"
-            }
-          ]
-        },
-        "entities": [
-          {
-            "entity": "2",
-            "value": 0.1
-          }
-        ]
-      }
-    },
-    {
-      "name": "Signature Creeds (CL)",
-      "valid": true,
-      "schema": "/@dcic/signature-commons-schema/core/signature.json",
-      "data": {
-        "$validator": "/@dcic/signature-commons-schema/core/signature.json",
-        "id": "1",
-        "library": "4",
-        "meta": {
-          "id": "drug:3323",
-          "Tissue": [
-            {
-              "Name": "liver",
-              "Remarks": "Liver *other remarks*",
-              "Accession": "BTO:0000759"
-            }
-          ],
-          "geo_id": "GSE2328",
-          "curator": "cadimo",
-          "version": "1.0",
-          "Organism": "Mus musculus",
-          "ctrl_ids": [
-            "GSM59",
-            "GSM12"
-          ],
-          "pert_ids": [
-            "GSM123",
-            "GSM55",
-            "GSM597"
-          ],
-          "platform": "GPL712",
-          "$validator": "/@dcic/signature-commons-schema/meta-1.1/signature/creeds.json",
-          "Small_Molecule": [
-            {
-              "Name": "Trichloroethylene",
-              "Smiles": "C(=C(Cl)Cl)Cl",
-              "PubChemID": "6575"
-            }
-          ],
-          "Perturbation_Type": "gene; drug; disease"
-        },
-        "entities": [
-          {
-            "entity": "2",
-            "value": 0.1
-          }
-        ]
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/signature/perturbation/disease.json b/meta-1.1/signature/perturbation/disease.json
deleted file mode 100755
index fbcf65e..0000000
--- a/meta-1.1/signature/perturbation/disease.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/disease.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "allOf": [
-    {
-      "type": "array",
-      "description": "The disease being studied",
-      "items": [
-        {
-          "type": "object",
-          "properties": {
-            "Name": {
-              "description": "The name of the disease",
-              "type": "string"
-            },
-            "Accession": {
-              "description": "The ontology accession of the disease",
-              "type": "string"
-            },
-            "Reference": {
-              "description": "External reference for the disease",
-              "type": "string"
-            },
-            "Remarks": {
-              "description": "Remark about this perturbation",
-              "type": "string"
-            }
-          },
-          "required": [
-            "Name"
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/signature/perturbation/other.json b/meta-1.1/signature/perturbation/other.json
deleted file mode 100755
index 36228ed..0000000
--- a/meta-1.1/signature/perturbation/other.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/other.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "allOf": [
-    {
-      "type": "array",
-      "description": "Other kinds of perturbation",
-      "items": [
-        {
-          "type": "object",
-          "properties": {
-            "Name": {
-              "description": "The name of the perturbation",
-              "type": "string"
-            },
-            "Accession": {
-              "description": "The ontology accession of the perturbation",
-              "type": "string"
-            },
-            "Remarks": {
-              "description": "Other metadata",
-              "type": "string"
-            }
-          },
-          "required": [
-            "Name"
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/signature/perturbation/phenotype.json b/meta-1.1/signature/perturbation/phenotype.json
deleted file mode 100755
index a5af4b5..0000000
--- a/meta-1.1/signature/perturbation/phenotype.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/phenotype.json",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "allOf": [
-    {
-      "type": "array",
-      "description": "The phenotype being studied",
-      "items": [
-        {
-          "type": "object",
-          "description": "The phenotype being studied",
-          "properties": {
-            "Name": {
-              "description": "The name of the phenotype",
-              "type": "string"
-            },
-            "Phenotype_ID" : {
-              "description": "External ID of the phenotype",
-              "type": "string"
-            }
-          },
-          "required": [
-            "Name"
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/meta-1.1/entity/draft-1.1.json b/meta/entity/draft-2.json
similarity index 91%
rename from meta-1.1/entity/draft-1.1.json
rename to meta/entity/draft-2.json
index bd44023..c0f1afb 100755
--- a/meta-1.1/entity/draft-1.1.json
+++ b/meta/entity/draft-2.json
@@ -1,5 +1,5 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/entity/draft-1.1.json",
+  "$id": "/@dcic/signature-commons-schema/meta/entity/draft-2.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {
diff --git a/meta-1.1/library/draft-1.1.json b/meta/library/draft-2.json
similarity index 98%
rename from meta-1.1/library/draft-1.1.json
rename to meta/library/draft-2.json
index fa1e348..0296606 100755
--- a/meta-1.1/library/draft-1.1.json
+++ b/meta/library/draft-2.json
@@ -1,5 +1,5 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/library/draft-1.1.json",
+  "$id": "/@dcic/signature-commons-schema/meta/library/draft-2.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {
diff --git a/meta-1.1/signature/clue-io.json b/meta/signature/clue-io-2.json
similarity index 99%
rename from meta-1.1/signature/clue-io.json
rename to meta/signature/clue-io-2.json
index a84d464..28708d0 100755
--- a/meta-1.1/signature/clue-io.json
+++ b/meta/signature/clue-io-2.json
@@ -1,5 +1,5 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/clue-io.json",
+  "$id": "/@dcic/signature-commons-schema/meta/signature/clue-io-2.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Signature metadata as described by https://api.clue.io/public/apis",
   "allOf": [
diff --git a/meta-1.1/signature/creeds.json b/meta/signature/creeds-2.json
similarity index 89%
rename from meta-1.1/signature/creeds.json
rename to meta/signature/creeds-2.json
index 7660bf3..ffe971f 100755
--- a/meta-1.1/signature/creeds.json
+++ b/meta/signature/creeds-2.json
@@ -1,5 +1,5 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/creeds.json",
+  "$id": "/@dcic/signature-commons-schema/meta/signature/creeds-2.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Signature metadata as seen in http://amp.pharm.mssm.edu/creeds/#downloads json downloads",
   "allOf": [
@@ -40,7 +40,7 @@
           "type": "string"
         },
         "Disease": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/disease.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/disease.json",
           "description": "Disease perturbations"
         },
         "geo_id": {
@@ -75,7 +75,7 @@
           "example": "1.0"
         },
         "Small_Molecule": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/small-molecule.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/small-molecule-2.json",
           "description": "Small Molecule used in the study"
         },
         "drug_name": {
@@ -119,7 +119,7 @@
           "type": "array"
         },
         "Gene": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/gene.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/gene-2.json",
           "description": "Gene involved"
         }
       },
diff --git a/meta-1.1/signature/draft-1.1.json b/meta/signature/draft-2.json
similarity index 94%
rename from meta-1.1/signature/draft-1.1.json
rename to meta/signature/draft-2.json
index 6f3e9f2..97c239c 100755
--- a/meta-1.1/signature/draft-1.1.json
+++ b/meta/signature/draft-2.json
@@ -1,5 +1,5 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/draft-1.1.json",
+  "$id": "/@dcic/signature-commons-schema/meta/signature/draft-2.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {
@@ -122,7 +122,7 @@
           "type": "string"
         },
         "Disease": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/disease.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/disease.json",
           "description": "Disease perturbations"
         },
         "Exact_Source": {
@@ -185,7 +185,7 @@
           "type": "object"
         },
         "Gene": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/gene.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/gene-2.json",
           "description": "Gene involved"
         },
         "Gene_Family": {
@@ -243,7 +243,7 @@
           "type": "string"
         },
         "Other": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/other.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/other.json",
           "description": "Other perturbations"
         },
         "PMID": {
@@ -289,7 +289,7 @@
           "type": "string"
         },
         "Phenotype": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/phenotype.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/phenotype.json",
           "description": "Phenotype perturbations"
         },
         "Program": {
@@ -315,7 +315,7 @@
           "type": "string"
         },
         "Small_Molecule": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/small-molecule.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/small-molecule-2.json",
           "description": "Small Molecule used in the study"
         },
         "Sub_Category_Code": {
@@ -363,7 +363,7 @@
           "type": "array"
         },
         "Virus": {
-          "$ref": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/disease.json",
+          "$ref": "/@dcic/signature-commons-schema/meta/signature/perturbation/disease.json",
           "description": "Virus perturbations TODO: Merge with disease perturbations"
         }
       },
diff --git a/meta-1.1/signature/perturbation/gene.json b/meta/signature/perturbation/gene-2.json
similarity index 92%
rename from meta-1.1/signature/perturbation/gene.json
rename to meta/signature/perturbation/gene-2.json
index f1e7381..2c4b2a4 100755
--- a/meta-1.1/signature/perturbation/gene.json
+++ b/meta/signature/perturbation/gene-2.json
@@ -1,5 +1,5 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/gene.json",
+  "$id": "/@dcic/signature-commons-schema/meta/signature/perturbation/gene-2.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {
diff --git a/meta-1.1/signature/perturbation/small-molecule.json b/meta/signature/perturbation/small-molecule-2.json
similarity index 93%
rename from meta-1.1/signature/perturbation/small-molecule.json
rename to meta/signature/perturbation/small-molecule-2.json
index 6dc36e4..ccf6183 100755
--- a/meta-1.1/signature/perturbation/small-molecule.json
+++ b/meta/signature/perturbation/small-molecule-2.json
@@ -1,5 +1,5 @@
 {
-  "$id": "/@dcic/signature-commons-schema/meta-1.1/signature/perturbation/small-molecule.json",
+  "$id": "/@dcic/signature-commons-schema/meta/signature/perturbation/small-molecule-2.json",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "allOf": [
     {