diff --git a/library/qs_source/core/core.qs b/library/core/core.qs
similarity index 100%
rename from library/qs_source/core/core.qs
rename to library/core/core.qs
diff --git a/library/qs_source/core/qir.qs b/library/core/qir.qs
similarity index 100%
rename from library/qs_source/core/qir.qs
rename to library/core/qir.qs
diff --git a/library/qs_source/qsharp.json b/library/qs_source/qsharp.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/library/qs_source/qsharp.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/library/src/README.md b/library/src/README.md
new file mode 100644
index 0000000000..507f4a94ea
--- /dev/null
+++ b/library/src/README.md
@@ -0,0 +1,3 @@
+# Library Rust Crate
+
+This crate is used for packaging and testing our Q# projects in a Rust environment.
\ No newline at end of file
diff --git a/library/src/lib.rs b/library/src/lib.rs
index de58fef9ea..bef834659a 100644
--- a/library/src/lib.rs
+++ b/library/src/lib.rs
@@ -12,85 +12,85 @@ pub const QSHARP_LIBRARY_URI_SCHEME: &str = "qsharp-library-source";
 pub const CORE_LIB: &[(&str, &str)] = &[
     (
         "qsharp-library-source:core/core.qs",
-        include_str!("../qs_source/core/core.qs"),
+        include_str!("../core/core.qs"),
     ),
     (
         "qsharp-library-source:core/qir.qs",
-        include_str!("../qs_source/core/qir.qs"),
+        include_str!("../core/qir.qs"),
     ),
 ];
 
 pub const STD_LIB: &[(&str, &str)] = &[
     (
         "qsharp-library-source:arrays.qs",
-        include_str!("../qs_source/src/std/arrays.qs"),
+        include_str!("../std/src/arrays.qs"),
     ),
     (
         "qsharp-library-source:canon.qs",
-        include_str!("../qs_source/src/std/canon.qs"),
+        include_str!("../std/src/canon.qs"),
     ),
     (
         "qsharp-library-source:convert.qs",
-        include_str!("../qs_source/src/std/convert.qs"),
+        include_str!("../std/src/convert.qs"),
     ),
     (
         "qsharp-library-source:core.qs",
-        include_str!("../qs_source/src/std/core.qs"),
+        include_str!("../std/src/core.qs"),
     ),
     (
         "qsharp-library-source:diagnostics.qs",
-        include_str!("../qs_source/src/std/diagnostics.qs"),
+        include_str!("../std/src/diagnostics.qs"),
     ),
     (
         "qsharp-library-source:internal.qs",
-        include_str!("../qs_source/src/std/internal.qs"),
+        include_str!("../std/src/internal.qs"),
     ),
     (
         "qsharp-library-source:intrinsic.qs",
-        include_str!("../qs_source/src/std/intrinsic.qs"),
+        include_str!("../std/src/intrinsic.qs"),
     ),
     (
         "qsharp-library-source:logical.qs",
-        include_str!("../qs_source/src/std/logical.qs"),
+        include_str!("../std/src/logical.qs"),
     ),
     (
         "qsharp-library-source:math.qs",
-        include_str!("../qs_source/src/std/math.qs"),
+        include_str!("../std/src/math.qs"),
     ),
     (
         "qsharp-library-source:measurement.qs",
-        include_str!("../qs_source/src/std/measurement.qs"),
+        include_str!("../std/src/measurement.qs"),
     ),
     (
         "qsharp-library-source:qir.qs",
-        include_str!("../qs_source/src/std/qir.qs"),
+        include_str!("../std/src/qir.qs"),
     ),
     (
         "qsharp-library-source:random.qs",
-        include_str!("../qs_source/src/std/random.qs"),
+        include_str!("../std/src/random.qs"),
     ),
     (
         "qsharp-library-source:re.qs",
-        include_str!("../qs_source/src/std/re.qs"),
+        include_str!("../std/src/re.qs"),
     ),
     (
         "qsharp-library-source:unstable_arithmetic.qs",
-        include_str!("../qs_source/src/std/unstable_arithmetic.qs"),
+        include_str!("../std/src/unstable_arithmetic.qs"),
     ),
     (
         "qsharp-library-source:unstable_arithmetic_internal.qs",
-        include_str!("../qs_source/src/std/unstable_arithmetic_internal.qs"),
+        include_str!("../std/src/unstable_arithmetic_internal.qs"),
     ),
     (
         "qsharp-library-source:unstable_state_preparation.qs",
-        include_str!("../qs_source/src/std/unstable_state_preparation.qs"),
+        include_str!("../std/src/unstable_state_preparation.qs"),
     ),
     (
         "qsharp-library-source:unstable_table_lookup.qs",
-        include_str!("../qs_source/src/std/unstable_table_lookup.qs"),
+        include_str!("../std/src/unstable_table_lookup.qs"),
     ),
     (
         "qsharp-library-source:modern_api.qs",
-        include_str!("../qs_source/src/std/modern_api.qs"),
+        include_str!("../std/src/modern_api.qs"),
     ),
 ];
diff --git a/library/README.md b/library/std/README.md
similarity index 100%
rename from library/README.md
rename to library/std/README.md
diff --git a/library/std/qsharp.json b/library/std/qsharp.json
new file mode 100644
index 0000000000..ed9a1ca5e3
--- /dev/null
+++ b/library/std/qsharp.json
@@ -0,0 +1,24 @@
+{
+  "author": "Microsoft",
+  "license": "MIT",
+  "files": [
+    "src/std/arrays.qs",
+    "src/std/canon.qs",
+    "src/std/convert.qs",
+    "src/std/core.qs",
+    "src/std/diagnostics.qs",
+    "src/std/internal.qs",
+    "src/std/intrinsic.qs",
+    "src/std/logical.qs",
+    "src/std/math.qs",
+    "src/std/measurement.qs",
+    "src/std/modern_api.qs",
+    "src/std/qir.qs",
+    "src/std/random.qs",
+    "src/std/re.qs",
+    "src/std/unstable_arithmetic.qs",
+    "src/std/unstable_arithmetic_internal.qs",
+    "src/std/unstable_state_preparation.qs",
+    "src/std/unstable_table_lookup.qs"
+  ]
+}
\ No newline at end of file
diff --git a/library/qs_source/src/std/arrays.qs b/library/std/src/arrays.qs
similarity index 100%
rename from library/qs_source/src/std/arrays.qs
rename to library/std/src/arrays.qs
diff --git a/library/qs_source/src/std/canon.qs b/library/std/src/canon.qs
similarity index 100%
rename from library/qs_source/src/std/canon.qs
rename to library/std/src/canon.qs
diff --git a/library/qs_source/src/std/convert.qs b/library/std/src/convert.qs
similarity index 100%
rename from library/qs_source/src/std/convert.qs
rename to library/std/src/convert.qs
diff --git a/library/qs_source/src/std/core.qs b/library/std/src/core.qs
similarity index 100%
rename from library/qs_source/src/std/core.qs
rename to library/std/src/core.qs
diff --git a/library/qs_source/src/std/diagnostics.qs b/library/std/src/diagnostics.qs
similarity index 100%
rename from library/qs_source/src/std/diagnostics.qs
rename to library/std/src/diagnostics.qs
diff --git a/library/qs_source/src/std/internal.qs b/library/std/src/internal.qs
similarity index 100%
rename from library/qs_source/src/std/internal.qs
rename to library/std/src/internal.qs
diff --git a/library/qs_source/src/std/intrinsic.qs b/library/std/src/intrinsic.qs
similarity index 100%
rename from library/qs_source/src/std/intrinsic.qs
rename to library/std/src/intrinsic.qs
diff --git a/library/qs_source/src/std/logical.qs b/library/std/src/logical.qs
similarity index 100%
rename from library/qs_source/src/std/logical.qs
rename to library/std/src/logical.qs
diff --git a/library/qs_source/src/std/math.qs b/library/std/src/math.qs
similarity index 100%
rename from library/qs_source/src/std/math.qs
rename to library/std/src/math.qs
diff --git a/library/qs_source/src/std/measurement.qs b/library/std/src/measurement.qs
similarity index 100%
rename from library/qs_source/src/std/measurement.qs
rename to library/std/src/measurement.qs
diff --git a/library/qs_source/src/std/modern_api.qs b/library/std/src/modern_api.qs
similarity index 100%
rename from library/qs_source/src/std/modern_api.qs
rename to library/std/src/modern_api.qs
diff --git a/library/qs_source/src/std/qir.qs b/library/std/src/qir.qs
similarity index 100%
rename from library/qs_source/src/std/qir.qs
rename to library/std/src/qir.qs
diff --git a/library/qs_source/src/std/random.qs b/library/std/src/random.qs
similarity index 100%
rename from library/qs_source/src/std/random.qs
rename to library/std/src/random.qs
diff --git a/library/qs_source/src/std/re.qs b/library/std/src/re.qs
similarity index 100%
rename from library/qs_source/src/std/re.qs
rename to library/std/src/re.qs
diff --git a/library/qs_source/src/std/unstable_arithmetic.qs b/library/std/src/unstable_arithmetic.qs
similarity index 100%
rename from library/qs_source/src/std/unstable_arithmetic.qs
rename to library/std/src/unstable_arithmetic.qs
diff --git a/library/qs_source/src/std/unstable_arithmetic_internal.qs b/library/std/src/unstable_arithmetic_internal.qs
similarity index 100%
rename from library/qs_source/src/std/unstable_arithmetic_internal.qs
rename to library/std/src/unstable_arithmetic_internal.qs
diff --git a/library/qs_source/src/std/unstable_state_preparation.qs b/library/std/src/unstable_state_preparation.qs
similarity index 100%
rename from library/qs_source/src/std/unstable_state_preparation.qs
rename to library/std/src/unstable_state_preparation.qs
diff --git a/library/qs_source/src/std/unstable_table_lookup.qs b/library/std/src/unstable_table_lookup.qs
similarity index 100%
rename from library/qs_source/src/std/unstable_table_lookup.qs
rename to library/std/src/unstable_table_lookup.qs