diff --git a/Samples-Typescript/Annotation/Annotation.trex b/Samples-Typescript/Dashboard/Annotation/Annotation.trex
similarity index 97%
rename from Samples-Typescript/Annotation/Annotation.trex
rename to Samples-Typescript/Dashboard/Annotation/Annotation.trex
index 1d1b4b78..ba39183a 100644
--- a/Samples-Typescript/Annotation/Annotation.trex
+++ b/Samples-Typescript/Dashboard/Annotation/Annotation.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.10</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/Annotation/annotation.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/Annotation/annotation.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/Annotation/annotation.html b/Samples-Typescript/Dashboard/Annotation/annotation.html
similarity index 87%
rename from Samples-Typescript/Annotation/annotation.html
rename to Samples-Typescript/Dashboard/Annotation/annotation.html
index 6a014b0a..403f4efc 100644
--- a/Samples-Typescript/Annotation/annotation.html
+++ b/Samples-Typescript/Dashboard/Annotation/annotation.html
@@ -10,10 +10,10 @@
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
   <!-- Extensions Library -->
-  <script src="../../lib/tableau.extensions.1.latest.js"></script>
+  <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
   <!-- Our extension's code -->
-  <script src="../../dist/annotation.js"></script>
+  <script src="../../../dist/annotation.js"></script>
 </head>
 <body>
   <div class="container">
diff --git a/Samples-Typescript/Annotation/annotation.ts b/Samples-Typescript/Dashboard/Annotation/annotation.ts
similarity index 100%
rename from Samples-Typescript/Annotation/annotation.ts
rename to Samples-Typescript/Dashboard/Annotation/annotation.ts
diff --git a/Samples-Typescript/DashboardLayout/DashboardLayout.trex b/Samples-Typescript/Dashboard/DashboardLayout/DashboardLayout.trex
similarity index 96%
rename from Samples-Typescript/DashboardLayout/DashboardLayout.trex
rename to Samples-Typescript/Dashboard/DashboardLayout/DashboardLayout.trex
index 39b11050..14085265 100644
--- a/Samples-Typescript/DashboardLayout/DashboardLayout.trex
+++ b/Samples-Typescript/Dashboard/DashboardLayout/DashboardLayout.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.7</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/DashboardLayout/dashboardLayout.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/DashboardLayout/dashboardLayout.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/DashboardLayout/dashboardLayout.html b/Samples-Typescript/Dashboard/DashboardLayout/dashboardLayout.html
similarity index 86%
rename from Samples-Typescript/DashboardLayout/dashboardLayout.html
rename to Samples-Typescript/Dashboard/DashboardLayout/dashboardLayout.html
index c2253baa..4e2b95c0 100644
--- a/Samples-Typescript/DashboardLayout/dashboardLayout.html
+++ b/Samples-Typescript/Dashboard/DashboardLayout/dashboardLayout.html
@@ -10,10 +10,10 @@
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
   <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-  <script src="../../lib/tableau.extensions.1.latest.js"></script>
+  <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
   <!-- Our extension's code -->
-  <script src="../../dist/dashboardLayout.js"></script>
+  <script src="../../../dist/dashboardLayout.js"></script>
 </head>
 <body>
   <div class="container">
diff --git a/Samples-Typescript/DashboardLayout/dashboardLayout.ts b/Samples-Typescript/Dashboard/DashboardLayout/dashboardLayout.ts
similarity index 100%
rename from Samples-Typescript/DashboardLayout/dashboardLayout.ts
rename to Samples-Typescript/Dashboard/DashboardLayout/dashboardLayout.ts
diff --git a/Samples-Typescript/DashboardObjectVisibility/DashboardObjectVisibility.trex b/Samples-Typescript/Dashboard/DashboardObjectVisibility/DashboardObjectVisibility.trex
similarity index 96%
rename from Samples-Typescript/DashboardObjectVisibility/DashboardObjectVisibility.trex
rename to Samples-Typescript/Dashboard/DashboardObjectVisibility/DashboardObjectVisibility.trex
index 14c8c3b8..d1b02e8c 100644
--- a/Samples-Typescript/DashboardObjectVisibility/DashboardObjectVisibility.trex
+++ b/Samples-Typescript/Dashboard/DashboardObjectVisibility/DashboardObjectVisibility.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.7</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/DashboardObjectVisibility/dashboardObjectVisibility.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/DashboardObjectVisibility/dashboardObjectVisibility.html b/Samples-Typescript/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.html
similarity index 82%
rename from Samples-Typescript/DashboardObjectVisibility/dashboardObjectVisibility.html
rename to Samples-Typescript/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.html
index 778d911e..0364caaa 100644
--- a/Samples-Typescript/DashboardObjectVisibility/dashboardObjectVisibility.html
+++ b/Samples-Typescript/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.html
@@ -9,10 +9,10 @@
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-  <script src="../../lib/tableau.extensions.1.latest.js"></script>
+  <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
   <!-- Our extension's code -->
-  <script src="../../dist/dashboardObjectVisibility.js"></script>
+  <script src="../../../dist/dashboardObjectVisibility.js"></script>
 </head>
 <body>
   <div class="container">
diff --git a/Samples-Typescript/DashboardObjectVisibility/dashboardObjectVisibility.tsx b/Samples-Typescript/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.tsx
similarity index 100%
rename from Samples-Typescript/DashboardObjectVisibility/dashboardObjectVisibility.tsx
rename to Samples-Typescript/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.tsx
diff --git a/Samples-Typescript/DataSources/DataSources.trex b/Samples-Typescript/Dashboard/DataSources/DataSources.trex
similarity index 94%
rename from Samples-Typescript/DataSources/DataSources.trex
rename to Samples-Typescript/Dashboard/DataSources/DataSources.trex
index 1bbdf172..18d89ee4 100644
--- a/Samples-Typescript/DataSources/DataSources.trex
+++ b/Samples-Typescript/Dashboard/DataSources/DataSources.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.8</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/DataSources/datasources.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/DataSources/datasources.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
     <permissions>
diff --git a/Samples-Typescript/DataSources/datasources.html b/Samples-Typescript/Dashboard/DataSources/datasources.html
similarity index 96%
rename from Samples-Typescript/DataSources/datasources.html
rename to Samples-Typescript/Dashboard/DataSources/datasources.html
index 1179cafc..3a8a1126 100644
--- a/Samples-Typescript/DataSources/datasources.html
+++ b/Samples-Typescript/Dashboard/DataSources/datasources.html
@@ -15,10 +15,10 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our webpack'd extension's code -->
-    <script src="../../dist/datasources.js"></script>
+    <script src="../../../dist/datasources.js"></script>
   </head>
   <body>
     <div class="container">
diff --git a/Samples-Typescript/DataSources/datasources.ts b/Samples-Typescript/Dashboard/DataSources/datasources.ts
similarity index 100%
rename from Samples-Typescript/DataSources/datasources.ts
rename to Samples-Typescript/Dashboard/DataSources/datasources.ts
diff --git a/Samples-Typescript/Filtering/Filtering.trex b/Samples-Typescript/Dashboard/Filtering/Filtering.trex
similarity index 94%
rename from Samples-Typescript/Filtering/Filtering.trex
rename to Samples-Typescript/Dashboard/Filtering/Filtering.trex
index e724c05e..a3286e95 100644
--- a/Samples-Typescript/Filtering/Filtering.trex
+++ b/Samples-Typescript/Dashboard/Filtering/Filtering.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.8</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/Filtering/filtering.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/Filtering/filtering.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/Filtering/filtering.html b/Samples-Typescript/Dashboard/Filtering/filtering.html
similarity index 93%
rename from Samples-Typescript/Filtering/filtering.html
rename to Samples-Typescript/Dashboard/Filtering/filtering.html
index 6e7270b8..cf1571c0 100644
--- a/Samples-Typescript/Filtering/filtering.html
+++ b/Samples-Typescript/Dashboard/Filtering/filtering.html
@@ -15,10 +15,10 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our webpack'd extension's code -->
-    <script src="../../dist/filtering.js"></script>
+    <script src="../../../dist/filtering.js"></script>
   </head>
   <body>
     <div class="container">
diff --git a/Samples-Typescript/Filtering/filtering.ts b/Samples-Typescript/Dashboard/Filtering/filtering.ts
similarity index 100%
rename from Samples-Typescript/Filtering/filtering.ts
rename to Samples-Typescript/Dashboard/Filtering/filtering.ts
diff --git a/Samples-Typescript/Formatting/formatting.html b/Samples-Typescript/Dashboard/Formatting/formatting.html
similarity index 94%
rename from Samples-Typescript/Formatting/formatting.html
rename to Samples-Typescript/Dashboard/Formatting/formatting.html
index 2bd43452..14ee412d 100644
--- a/Samples-Typescript/Formatting/formatting.html
+++ b/Samples-Typescript/Dashboard/Formatting/formatting.html
@@ -11,10 +11,10 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our webpack'd extension's code -->
-    <script src="../../dist/formatting.js"></script>
+    <script src="../../../dist/formatting.js"></script>
 
     <style>
       .tooltip-header {
diff --git a/Samples/Formatting/formatting.trex b/Samples-Typescript/Dashboard/Formatting/formatting.trex
similarity index 97%
rename from Samples/Formatting/formatting.trex
rename to Samples-Typescript/Dashboard/Formatting/formatting.trex
index af3eabd2..a470b14e 100644
--- a/Samples/Formatting/formatting.trex
+++ b/Samples-Typescript/Dashboard/Formatting/formatting.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.1</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/Formatting/formatting.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/Formatting/formatting.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJTUUH4QgLDTYEcBRoeAAABp9JREFUeNrlm01sHEUWx//vVbs79gThjAd2iflIAkEcEARfEciBSYLEbbV8SJaDEpIAMQgkViuirA8IskKcdiEJX3G0C5dNpAVxQLIyiYw4YYIQBw4RBoMgBBIbCRtnOsx0vbcHd9sTZ3r8ge2p2bQ0B/+7unp+1dX/eX71ivL5TgAwAAQAxR/rsiYidvv2btq6ddcqVRwE8JCqgoigqgAAIvpKVbf29v51cHDwUxWRav2pWbdujcH04cUnPFc1EZGOjtv5hRdebv3tt9I+IupWVSaiGBxgJqhqlpnPj42NnchmsxpFUbX+mJORiE9E8eigorEzmohEHR23U1/fO63j47/+nYh2qqpJ4CcHgKEKMPOxIPBfef75PeUwDNPuoclozGxgXdMq4X/5ZWwfEe1Q1crZO/UKENGxIPCfKBbD4U2bNvo17qEeAHYJNA3+jjtuW2x4TgbAAmhyATRNy+XauK/vndaxsfEXFwk+0SIv/kNR/d2rOzwAc+TIu5ExnCeiR2vA9weB3zNXeM/zImutSUzQWfgYUpnNlapa6eCVP3slIjoShheGN2++Z1b4q6/+Q3T69Jng7Nlz0hAmODFxhq+4ol1S4AHAF5Fe3286u2PH1v5Dh9724nOX9Hf8+IfllpaWm8Mw3E2Eo4wGMMGVK1cLM6fBJ9q6cjna39W1c0tX14PW9/2q8JlMy01hGL4C4GlV/IsxHRnVHTRNi2G5BnyirbPWHty+vSe/YcOt5Pv+JfDFYrgfwBYAUNX1jGkTrDtoLU1E7CzwybEWwBsvvfSPe9evvxHGsKbAg4imwk1yBRTVTRCe5xlr7WzwibYGwOsHDry1O4qi/pnwAMDMEBEkL5YToGlaGP7E1tpaJlhNW2ut3e953rZiMfxnJXxlu4aIBJub/1gyxngiMlf4RLvRWnsQgF+tHRGp8yZYKAyUgiC4RVW75gmfaCtQ3UDLqnrUaRMsFAZKK1asuKVcLr+pqncuAD5NswAONzc3P+lsJDgD/q5Fhu/L5bJ/C8Nw1EkTXHr4tr3nzo2Obtx4NzlngssDPzKaz3d6xrBbJriM8E00mUayzvw7vEB4JaL3VfUDZjYARERgjGFrrY01FZGJtrZsoQI+ua9xIhJcKDwzHWU2T5dKpbP9/e/RNdes1h9++J7b26+TH388QwBw/fVrdGjoFJ869aXOgPcQJ0TQyPDd3Q+Pbtq0sQnTma0IF2e4Es2bCY965wQXA/67777nBX4XBlA/E6wzvEG8SFIXE3QAPtGWPyfoELyH+BXAZQq/vCboIPzymaCD8Mtngo7CJ9rSmqDj8Etrgg0Av3Qm2CDwS2OCDQK/NCbYQPCJtngm2IDwi2eCDQq/OCbYwPC/3wQbGD7dBEUkuuqqHHd0bLDbtj0iJ09+wu3t15XiFFM0mXY6zfff/+dSc3PDwieaoXy+M6mgrKzGWjU+Pp5nNq1xchEAWESsMcZYa4WZPVXtmseKjWvwF+cEK+vwkmosa22yNj8FlSxRz3Oh0kl4JCY4nyLEBWiuwk+a4PnzRXsZwk+ZIKlaam1dtSquvb1c4BONiJmzqvoiEe26zOA9ABER0X+I8CfVqcWE3wsPZnqf2ezq7n74Z5fhEQdCD4poNXgBcGEhAyKiH5TL5XOOwzMAZlWli+vtpwuPmflxAF/PdzYwM6dVajqkEQDLafBB4PdYa//d1OQ9parDc4WPD4n7dQG0lmbiJ6Uz4Z8oFsPhzZvv8ffs+Uu/MaYHwDdzhIeIYGLijFOFFymaXlQ9NbPeXkSijz/+xPT07DxGRI8T0bdzeRWMMbxy5WpxCDTdBIloSCR9s4G1loaGvsZzzz1zAsBjyUyoNRustXZGdUa9QWua4CPM/Krvp282KJVK3ueff6GHDx84bozZDWB4FhN0CbR2JLhly708PPytd+21qyNjTM2LiAiFwkDZ87xt1trXAATVZgMz77LWvpXPd85l20pdI0G21uratTfMCg8AhcJAOZNpucla+0AaPIBIRCYGB080hAl6ACAis15UreS8CrwFcLitLXu8UPgw2YvoAmjNSHDWJzUP+L5crm3vyMjoyMDAR67DT5ogZskJzhe+SilavUFrR4KYzglectGzzz4ZZTKZm4vF8NX/M/hEq7owwgCQybREvb37gmKxuBvAfcD0NpNKwwNwKJfLTpWfVoHnKl/CFU05fvoUN9D4ExWLIZ88+dkFIjoK4KsEXkSmBkBV/xsEwd6RkZ9H8/lOJiKN+7mkP1e1/wFtM6PWK/V/BwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0wOC0xMVQxMzo1NDowNC0wNDowMMrC9wEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMDgtMTFUMTM6NTQ6MDQtMDQ6MDC7n0+9AAAAAElFTkSuQmCC</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/Formatting/formatting.tsx b/Samples-Typescript/Dashboard/Formatting/formatting.tsx
similarity index 100%
rename from Samples-Typescript/Formatting/formatting.tsx
rename to Samples-Typescript/Dashboard/Formatting/formatting.tsx
diff --git a/Samples-Typescript/MoveAndResize/MoveAndResize.trex b/Samples-Typescript/Dashboard/MoveAndResize/MoveAndResize.trex
similarity index 94%
rename from Samples-Typescript/MoveAndResize/MoveAndResize.trex
rename to Samples-Typescript/Dashboard/MoveAndResize/MoveAndResize.trex
index 42f1032e..2bd5ae45 100644
--- a/Samples-Typescript/MoveAndResize/MoveAndResize.trex
+++ b/Samples-Typescript/Dashboard/MoveAndResize/MoveAndResize.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.7</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/MoveAndResize/moveandresize.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/MoveAndResize/moveandresize.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/MoveAndResize/moveAndResize.tsx b/Samples-Typescript/Dashboard/MoveAndResize/moveAndResize.tsx
similarity index 100%
rename from Samples-Typescript/MoveAndResize/moveAndResize.tsx
rename to Samples-Typescript/Dashboard/MoveAndResize/moveAndResize.tsx
diff --git a/Samples-Typescript/MoveAndResize/moveandresize.html b/Samples-Typescript/Dashboard/MoveAndResize/moveandresize.html
similarity index 85%
rename from Samples-Typescript/MoveAndResize/moveandresize.html
rename to Samples-Typescript/Dashboard/MoveAndResize/moveandresize.html
index 8cd3ae62..9f7f555a 100644
--- a/Samples-Typescript/MoveAndResize/moveandresize.html
+++ b/Samples-Typescript/Dashboard/MoveAndResize/moveandresize.html
@@ -16,10 +16,10 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our webpack'd extension's code -->
-    <script src="../../dist/moveAndResize.js"></script>
+    <script src="../../../dist/moveAndResize.js"></script>
   </head>
   <body>
     <div class="container">
diff --git a/Samples-Typescript/Parameters/Parameters.trex b/Samples-Typescript/Dashboard/Parameters/Parameters.trex
similarity index 94%
rename from Samples-Typescript/Parameters/Parameters.trex
rename to Samples-Typescript/Dashboard/Parameters/Parameters.trex
index afec11a7..488b1ef5 100644
--- a/Samples-Typescript/Parameters/Parameters.trex
+++ b/Samples-Typescript/Dashboard/Parameters/Parameters.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.8</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/Parameters/parameters.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/Parameters/parameters.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/Parameters/parameters.html b/Samples-Typescript/Dashboard/Parameters/parameters.html
similarity index 92%
rename from Samples-Typescript/Parameters/parameters.html
rename to Samples-Typescript/Dashboard/Parameters/parameters.html
index 7861fe0b..7cb0c6cf 100644
--- a/Samples-Typescript/Parameters/parameters.html
+++ b/Samples-Typescript/Dashboard/Parameters/parameters.html
@@ -15,10 +15,10 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our webpack'd extension's code -->
-    <script src="../../dist/parameters.js"></script>
+    <script src="../../../dist/parameters.js"></script>
   </head>
   <body>
     <div class="container">
diff --git a/Samples-Typescript/Parameters/parameters.ts b/Samples-Typescript/Dashboard/Parameters/parameters.ts
similarity index 100%
rename from Samples-Typescript/Parameters/parameters.ts
rename to Samples-Typescript/Dashboard/Parameters/parameters.ts
diff --git a/Samples-Typescript/ReplayAnimation/ReplayAnimation.trex b/Samples-Typescript/Dashboard/ReplayAnimation/ReplayAnimation.trex
similarity index 96%
rename from Samples-Typescript/ReplayAnimation/ReplayAnimation.trex
rename to Samples-Typescript/Dashboard/ReplayAnimation/ReplayAnimation.trex
index 7672f7d1..d2bee952 100644
--- a/Samples-Typescript/ReplayAnimation/ReplayAnimation.trex
+++ b/Samples-Typescript/Dashboard/ReplayAnimation/ReplayAnimation.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.1</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/ReplayAnimation/replayanimation.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/ReplayAnimation/replayanimation.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/ReplayAnimation/replayAnimation.tsx b/Samples-Typescript/Dashboard/ReplayAnimation/replayAnimation.tsx
similarity index 100%
rename from Samples-Typescript/ReplayAnimation/replayAnimation.tsx
rename to Samples-Typescript/Dashboard/ReplayAnimation/replayAnimation.tsx
diff --git a/Samples-Typescript/ReplayAnimation/replayanimation.html b/Samples-Typescript/Dashboard/ReplayAnimation/replayanimation.html
similarity index 83%
rename from Samples-Typescript/ReplayAnimation/replayanimation.html
rename to Samples-Typescript/Dashboard/ReplayAnimation/replayanimation.html
index 674d1d17..b3f91fc0 100644
--- a/Samples-Typescript/ReplayAnimation/replayanimation.html
+++ b/Samples-Typescript/Dashboard/ReplayAnimation/replayanimation.html
@@ -16,10 +16,10 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
-    <script src="../../dist/replayAnimation.js"></script>
+    <script src="../../../dist/replayAnimation.js"></script>
   </head>
   <body>
     <div class="container">
diff --git a/Samples-Typescript/VizImage/VizImage.trex b/Samples-Typescript/Dashboard/VizImage/VizImage.trex
similarity index 94%
rename from Samples-Typescript/VizImage/VizImage.trex
rename to Samples-Typescript/Dashboard/VizImage/VizImage.trex
index fdddc5f3..4d40d17f 100644
--- a/Samples-Typescript/VizImage/VizImage.trex
+++ b/Samples-Typescript/Dashboard/VizImage/VizImage.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/VizImage/vizImage.html</url>
+      <url>http://localhost:8765/Samples-Typescript/Dashboard/VizImage/vizImage.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples-Typescript/VizImage/vizImage.html b/Samples-Typescript/Dashboard/VizImage/vizImage.html
similarity index 93%
rename from Samples-Typescript/VizImage/vizImage.html
rename to Samples-Typescript/Dashboard/VizImage/vizImage.html
index 77062d2e..d8e6d75b 100644
--- a/Samples-Typescript/VizImage/vizImage.html
+++ b/Samples-Typescript/Dashboard/VizImage/vizImage.html
@@ -14,10 +14,10 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
-    <script src="../../dist/vizImage.js"></script>
+    <script src="../../../dist/vizImage.js"></script>
   </head>
   <body>
     <div class="container">
diff --git a/Samples-Typescript/VizImage/vizImage.ts b/Samples-Typescript/Dashboard/VizImage/vizImage.ts
similarity index 100%
rename from Samples-Typescript/VizImage/vizImage.ts
rename to Samples-Typescript/Dashboard/VizImage/vizImage.ts
diff --git a/Samples/Annotation/Annotation.trex b/Samples/Dashboard/Annotation/Annotation.trex
similarity index 97%
rename from Samples/Annotation/Annotation.trex
rename to Samples/Dashboard/Annotation/Annotation.trex
index 9b864779..b90c48db 100644
--- a/Samples/Annotation/Annotation.trex
+++ b/Samples/Dashboard/Annotation/Annotation.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.10</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/Annotation/annotation.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/Annotation/annotation.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Samples/Annotation/annotation.html b/Samples/Dashboard/Annotation/annotation.html
similarity index 92%
rename from Samples/Annotation/annotation.html
rename to Samples/Dashboard/Annotation/annotation.html
index 9a05b902..45095632 100644
--- a/Samples/Annotation/annotation.html
+++ b/Samples/Dashboard/Annotation/annotation.html
@@ -10,7 +10,7 @@
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
   <!-- Extensions Library -->
-  <script src="../../lib/tableau.extensions.1.latest.js"></script>
+  <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
   <!-- Our extension's code -->
   <script src="./annotation.js"></script>
diff --git a/Samples/Annotation/annotation.js b/Samples/Dashboard/Annotation/annotation.js
similarity index 100%
rename from Samples/Annotation/annotation.js
rename to Samples/Dashboard/Annotation/annotation.js
diff --git a/Samples/ClickThrough/ClickThrough.trex b/Samples/Dashboard/ClickThrough/ClickThrough.trex
similarity index 97%
rename from Samples/ClickThrough/ClickThrough.trex
rename to Samples/Dashboard/ClickThrough/ClickThrough.trex
index b36234a2..f5ed240f 100644
--- a/Samples/ClickThrough/ClickThrough.trex
+++ b/Samples/Dashboard/ClickThrough/ClickThrough.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.7</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/ClickThrough/clickThrough.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/ClickThrough/clickThrough.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Samples/ClickThrough/clickThrough.html b/Samples/Dashboard/ClickThrough/clickThrough.html
similarity index 90%
rename from Samples/ClickThrough/clickThrough.html
rename to Samples/Dashboard/ClickThrough/clickThrough.html
index 682df9f0..ce9555bc 100644
--- a/Samples/ClickThrough/clickThrough.html
+++ b/Samples/Dashboard/ClickThrough/clickThrough.html
@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-  <script src="../../lib/tableau.extensions.1.latest.js"></script>
+  <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
   <!-- Our extension's code -->
   <script src="./clickThrough.js"></script>
diff --git a/Samples/ClickThrough/clickThrough.js b/Samples/Dashboard/ClickThrough/clickThrough.js
similarity index 100%
rename from Samples/ClickThrough/clickThrough.js
rename to Samples/Dashboard/ClickThrough/clickThrough.js
diff --git a/Samples/DashboardLayout/DashboardLayout.trex b/Samples/Dashboard/DashboardLayout/DashboardLayout.trex
similarity index 97%
rename from Samples/DashboardLayout/DashboardLayout.trex
rename to Samples/Dashboard/DashboardLayout/DashboardLayout.trex
index ddaf84b8..66ca427a 100644
--- a/Samples/DashboardLayout/DashboardLayout.trex
+++ b/Samples/Dashboard/DashboardLayout/DashboardLayout.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.7</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/DashboardLayout/dashboardLayout.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/DashboardLayout/dashboardLayout.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJTUUH4QgLDTYEcBRoeAAABp9JREFUeNrlm01sHEUWx//vVbs79gThjAd2iflIAkEcEARfEciBSYLEbbV8SJaDEpIAMQgkViuirA8IskKcdiEJX3G0C5dNpAVxQLIyiYw4YYIQBw4RBoMgBBIbCRtnOsx0vbcHd9sTZ3r8ge2p2bQ0B/+7unp+1dX/eX71ivL5TgAwAAQAxR/rsiYidvv2btq6ddcqVRwE8JCqgoigqgAAIvpKVbf29v51cHDwUxWRav2pWbdujcH04cUnPFc1EZGOjtv5hRdebv3tt9I+IupWVSaiGBxgJqhqlpnPj42NnchmsxpFUbX+mJORiE9E8eigorEzmohEHR23U1/fO63j47/+nYh2qqpJ4CcHgKEKMPOxIPBfef75PeUwDNPuoclozGxgXdMq4X/5ZWwfEe1Q1crZO/UKENGxIPCfKBbD4U2bNvo17qEeAHYJNA3+jjtuW2x4TgbAAmhyATRNy+XauK/vndaxsfEXFwk+0SIv/kNR/d2rOzwAc+TIu5ExnCeiR2vA9weB3zNXeM/zImutSUzQWfgYUpnNlapa6eCVP3slIjoShheGN2++Z1b4q6/+Q3T69Jng7Nlz0hAmODFxhq+4ol1S4AHAF5Fe3286u2PH1v5Dh9724nOX9Hf8+IfllpaWm8Mw3E2Eo4wGMMGVK1cLM6fBJ9q6cjna39W1c0tX14PW9/2q8JlMy01hGL4C4GlV/IsxHRnVHTRNi2G5BnyirbPWHty+vSe/YcOt5Pv+JfDFYrgfwBYAUNX1jGkTrDtoLU1E7CzwybEWwBsvvfSPe9evvxHGsKbAg4imwk1yBRTVTRCe5xlr7WzwibYGwOsHDry1O4qi/pnwAMDMEBEkL5YToGlaGP7E1tpaJlhNW2ut3e953rZiMfxnJXxlu4aIBJub/1gyxngiMlf4RLvRWnsQgF+tHRGp8yZYKAyUgiC4RVW75gmfaCtQ3UDLqnrUaRMsFAZKK1asuKVcLr+pqncuAD5NswAONzc3P+lsJDgD/q5Fhu/L5bJ/C8Nw1EkTXHr4tr3nzo2Obtx4NzlngssDPzKaz3d6xrBbJriM8E00mUayzvw7vEB4JaL3VfUDZjYARERgjGFrrY01FZGJtrZsoQI+ua9xIhJcKDwzHWU2T5dKpbP9/e/RNdes1h9++J7b26+TH388QwBw/fVrdGjoFJ869aXOgPcQJ0TQyPDd3Q+Pbtq0sQnTma0IF2e4Es2bCY965wQXA/67777nBX4XBlA/E6wzvEG8SFIXE3QAPtGWPyfoELyH+BXAZQq/vCboIPzymaCD8Mtngo7CJ9rSmqDj8Etrgg0Av3Qm2CDwS2OCDQK/NCbYQPCJtngm2IDwi2eCDQq/OCbYwPC/3wQbGD7dBEUkuuqqHHd0bLDbtj0iJ09+wu3t15XiFFM0mXY6zfff/+dSc3PDwieaoXy+M6mgrKzGWjU+Pp5nNq1xchEAWESsMcZYa4WZPVXtmseKjWvwF+cEK+vwkmosa22yNj8FlSxRz3Oh0kl4JCY4nyLEBWiuwk+a4PnzRXsZwk+ZIKlaam1dtSquvb1c4BONiJmzqvoiEe26zOA9ABER0X+I8CfVqcWE3wsPZnqf2ezq7n74Z5fhEQdCD4poNXgBcGEhAyKiH5TL5XOOwzMAZlWli+vtpwuPmflxAF/PdzYwM6dVajqkEQDLafBB4PdYa//d1OQ9parDc4WPD4n7dQG0lmbiJ6Uz4Z8oFsPhzZvv8ffs+Uu/MaYHwDdzhIeIYGLijFOFFymaXlQ9NbPeXkSijz/+xPT07DxGRI8T0bdzeRWMMbxy5WpxCDTdBIloSCR9s4G1loaGvsZzzz1zAsBjyUyoNRustXZGdUa9QWua4CPM/Krvp282KJVK3ueff6GHDx84bozZDWB4FhN0CbR2JLhly708PPytd+21qyNjTM2LiAiFwkDZ87xt1trXAATVZgMz77LWvpXPd85l20pdI0G21uratTfMCg8AhcJAOZNpucla+0AaPIBIRCYGB080hAl6ACAis15UreS8CrwFcLitLXu8UPgw2YvoAmjNSHDWJzUP+L5crm3vyMjoyMDAR67DT5ogZskJzhe+SilavUFrR4KYzglectGzzz4ZZTKZm4vF8NX/M/hEq7owwgCQybREvb37gmKxuBvAfcD0NpNKwwNwKJfLTpWfVoHnKl/CFU05fvoUN9D4ExWLIZ88+dkFIjoK4KsEXkSmBkBV/xsEwd6RkZ9H8/lOJiKN+7mkP1e1/wFtM6PWK/V/BwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0wOC0xMVQxMzo1NDowNC0wNDowMMrC9wEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMDgtMTFUMTM6NTQ6MDQtMDQ6MDC7n0+9AAAAAElFTkSuQmCC</icon>
   </dashboard-extension>
diff --git a/Samples/DashboardLayout/dashboardLayout.html b/Samples/Dashboard/DashboardLayout/dashboardLayout.html
similarity index 92%
rename from Samples/DashboardLayout/dashboardLayout.html
rename to Samples/Dashboard/DashboardLayout/dashboardLayout.html
index dc392969..e7001a64 100644
--- a/Samples/DashboardLayout/dashboardLayout.html
+++ b/Samples/Dashboard/DashboardLayout/dashboardLayout.html
@@ -10,7 +10,7 @@
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
   <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-  <script src="../../lib/tableau.extensions.1.latest.js"></script>
+  <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
   <!-- Our extension's code -->
   <script src="./dashboardLayout.js"></script>
diff --git a/Samples/DashboardLayout/dashboardLayout.js b/Samples/Dashboard/DashboardLayout/dashboardLayout.js
similarity index 100%
rename from Samples/DashboardLayout/dashboardLayout.js
rename to Samples/Dashboard/DashboardLayout/dashboardLayout.js
diff --git a/Samples/DashboardObjectVisibility/DashboardObjectVisibility.trex b/Samples/Dashboard/DashboardObjectVisibility/DashboardObjectVisibility.trex
similarity index 96%
rename from Samples/DashboardObjectVisibility/DashboardObjectVisibility.trex
rename to Samples/Dashboard/DashboardObjectVisibility/DashboardObjectVisibility.trex
index b754b272..3246c6d1 100644
--- a/Samples/DashboardObjectVisibility/DashboardObjectVisibility.trex
+++ b/Samples/Dashboard/DashboardObjectVisibility/DashboardObjectVisibility.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.7</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/DashboardObjectVisibility/dashboardObjectVisibility.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJTUUH4QgLDTYEcBRoeAAABp9JREFUeNrlm01sHEUWx//vVbs79gThjAd2iflIAkEcEARfEciBSYLEbbV8SJaDEpIAMQgkViuirA8IskKcdiEJX3G0C5dNpAVxQLIyiYw4YYIQBw4RBoMgBBIbCRtnOsx0vbcHd9sTZ3r8ge2p2bQ0B/+7unp+1dX/eX71ivL5TgAwAAQAxR/rsiYidvv2btq6ddcqVRwE8JCqgoigqgAAIvpKVbf29v51cHDwUxWRav2pWbdujcH04cUnPFc1EZGOjtv5hRdebv3tt9I+IupWVSaiGBxgJqhqlpnPj42NnchmsxpFUbX+mJORiE9E8eigorEzmohEHR23U1/fO63j47/+nYh2qqpJ4CcHgKEKMPOxIPBfef75PeUwDNPuoclozGxgXdMq4X/5ZWwfEe1Q1crZO/UKENGxIPCfKBbD4U2bNvo17qEeAHYJNA3+jjtuW2x4TgbAAmhyATRNy+XauK/vndaxsfEXFwk+0SIv/kNR/d2rOzwAc+TIu5ExnCeiR2vA9weB3zNXeM/zImutSUzQWfgYUpnNlapa6eCVP3slIjoShheGN2++Z1b4q6/+Q3T69Jng7Nlz0hAmODFxhq+4ol1S4AHAF5Fe3286u2PH1v5Dh9724nOX9Hf8+IfllpaWm8Mw3E2Eo4wGMMGVK1cLM6fBJ9q6cjna39W1c0tX14PW9/2q8JlMy01hGL4C4GlV/IsxHRnVHTRNi2G5BnyirbPWHty+vSe/YcOt5Pv+JfDFYrgfwBYAUNX1jGkTrDtoLU1E7CzwybEWwBsvvfSPe9evvxHGsKbAg4imwk1yBRTVTRCe5xlr7WzwibYGwOsHDry1O4qi/pnwAMDMEBEkL5YToGlaGP7E1tpaJlhNW2ut3e953rZiMfxnJXxlu4aIBJub/1gyxngiMlf4RLvRWnsQgF+tHRGp8yZYKAyUgiC4RVW75gmfaCtQ3UDLqnrUaRMsFAZKK1asuKVcLr+pqncuAD5NswAONzc3P+lsJDgD/q5Fhu/L5bJ/C8Nw1EkTXHr4tr3nzo2Obtx4NzlngssDPzKaz3d6xrBbJriM8E00mUayzvw7vEB4JaL3VfUDZjYARERgjGFrrY01FZGJtrZsoQI+ua9xIhJcKDwzHWU2T5dKpbP9/e/RNdes1h9++J7b26+TH388QwBw/fVrdGjoFJ869aXOgPcQJ0TQyPDd3Q+Pbtq0sQnTma0IF2e4Es2bCY965wQXA/67777nBX4XBlA/E6wzvEG8SFIXE3QAPtGWPyfoELyH+BXAZQq/vCboIPzymaCD8Mtngo7CJ9rSmqDj8Etrgg0Av3Qm2CDwS2OCDQK/NCbYQPCJtngm2IDwi2eCDQq/OCbYwPC/3wQbGD7dBEUkuuqqHHd0bLDbtj0iJ09+wu3t15XiFFM0mXY6zfff/+dSc3PDwieaoXy+M6mgrKzGWjU+Pp5nNq1xchEAWESsMcZYa4WZPVXtmseKjWvwF+cEK+vwkmosa22yNj8FlSxRz3Oh0kl4JCY4nyLEBWiuwk+a4PnzRXsZwk+ZIKlaam1dtSquvb1c4BONiJmzqvoiEe26zOA9ABER0X+I8CfVqcWE3wsPZnqf2ezq7n74Z5fhEQdCD4poNXgBcGEhAyKiH5TL5XOOwzMAZlWli+vtpwuPmflxAF/PdzYwM6dVajqkEQDLafBB4PdYa//d1OQ9parDc4WPD4n7dQG0lmbiJ6Uz4Z8oFsPhzZvv8ffs+Uu/MaYHwDdzhIeIYGLijFOFFymaXlQ9NbPeXkSijz/+xPT07DxGRI8T0bdzeRWMMbxy5WpxCDTdBIloSCR9s4G1loaGvsZzzz1zAsBjyUyoNRustXZGdUa9QWua4CPM/Krvp282KJVK3ueff6GHDx84bozZDWB4FhN0CbR2JLhly708PPytd+21qyNjTM2LiAiFwkDZ87xt1trXAATVZgMz77LWvpXPd85l20pdI0G21uratTfMCg8AhcJAOZNpucla+0AaPIBIRCYGB080hAl6ACAis15UreS8CrwFcLitLXu8UPgw2YvoAmjNSHDWJzUP+L5crm3vyMjoyMDAR67DT5ogZskJzhe+SilavUFrR4KYzglectGzzz4ZZTKZm4vF8NX/M/hEq7owwgCQybREvb37gmKxuBvAfcD0NpNKwwNwKJfLTpWfVoHnKl/CFU05fvoUN9D4ExWLIZ88+dkFIjoK4KsEXkSmBkBV/xsEwd6RkZ9H8/lOJiKN+7mkP1e1/wFtM6PWK/V/BwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0wOC0xMVQxMzo1NDowNC0wNDowMMrC9wEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTctMDgtMTFUMTM6NTQ6MDQtMDQ6MDC7n0+9AAAAAElFTkSuQmCC</icon>
   </dashboard-extension>
diff --git a/Samples/DashboardObjectVisibility/dashboardObjectVisibility.html b/Samples/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.html
similarity index 92%
rename from Samples/DashboardObjectVisibility/dashboardObjectVisibility.html
rename to Samples/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.html
index df5cc977..39b32e98 100644
--- a/Samples/DashboardObjectVisibility/dashboardObjectVisibility.html
+++ b/Samples/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.html
@@ -13,7 +13,7 @@
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-  <script src="../../lib/tableau.extensions.1.latest.js"></script>
+  <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
   <!-- Our extension's code -->
   <script src="./dashboardObjectVisibility.js"></script>
diff --git a/Samples/DashboardObjectVisibility/dashboardObjectVisibility.js b/Samples/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.js
similarity index 100%
rename from Samples/DashboardObjectVisibility/dashboardObjectVisibility.js
rename to Samples/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.js
diff --git a/Samples/DataSources/DataSources.trex b/Samples/Dashboard/DataSources/DataSources.trex
similarity index 95%
rename from Samples/DataSources/DataSources.trex
rename to Samples/Dashboard/DataSources/DataSources.trex
index 8c9df8e8..e9c041ac 100644
--- a/Samples/DataSources/DataSources.trex
+++ b/Samples/Dashboard/DataSources/DataSources.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.8</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/DataSources/datasources.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/DataSources/datasources.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
     <permissions>
diff --git a/Samples/DataSources/datasources.html b/Samples/Dashboard/DataSources/datasources.html
similarity index 97%
rename from Samples/DataSources/datasources.html
rename to Samples/Dashboard/DataSources/datasources.html
index 57e74460..253d9e7e 100644
--- a/Samples/DataSources/datasources.html
+++ b/Samples/Dashboard/DataSources/datasources.html
@@ -15,7 +15,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
     <script src="./datasources.js"></script>
diff --git a/Samples/DataSources/datasources.js b/Samples/Dashboard/DataSources/datasources.js
similarity index 100%
rename from Samples/DataSources/datasources.js
rename to Samples/Dashboard/DataSources/datasources.js
diff --git a/Samples/Filtering/Filtering.trex b/Samples/Dashboard/Filtering/Filtering.trex
similarity index 95%
rename from Samples/Filtering/Filtering.trex
rename to Samples/Dashboard/Filtering/Filtering.trex
index 1fed47da..92320d8b 100644
--- a/Samples/Filtering/Filtering.trex
+++ b/Samples/Dashboard/Filtering/Filtering.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.8</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/Filtering/filtering.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/Filtering/filtering.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples/Filtering/filtering.html b/Samples/Dashboard/Filtering/filtering.html
similarity index 96%
rename from Samples/Filtering/filtering.html
rename to Samples/Dashboard/Filtering/filtering.html
index 8e8f033f..93e02685 100644
--- a/Samples/Filtering/filtering.html
+++ b/Samples/Dashboard/Filtering/filtering.html
@@ -15,7 +15,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
     <script src="./filtering.js"></script>
diff --git a/Samples/Filtering/filtering.js b/Samples/Dashboard/Filtering/filtering.js
similarity index 100%
rename from Samples/Filtering/filtering.js
rename to Samples/Dashboard/Filtering/filtering.js
diff --git a/Samples/Formatting/formatting.html b/Samples/Dashboard/Formatting/formatting.html
similarity index 98%
rename from Samples/Formatting/formatting.html
rename to Samples/Dashboard/Formatting/formatting.html
index 7ccac9fe..6fbf07c4 100644
--- a/Samples/Formatting/formatting.html
+++ b/Samples/Dashboard/Formatting/formatting.html
@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
     <style>
       .tooltip-header {
         position: relative;
diff --git a/Samples-Typescript/Formatting/formatting.trex b/Samples/Dashboard/Formatting/formatting.trex
similarity index 93%
rename from Samples-Typescript/Formatting/formatting.trex
rename to Samples/Dashboard/Formatting/formatting.trex
index 9eb24dd9..cb17f40a 100644
--- a/Samples-Typescript/Formatting/formatting.trex
+++ b/Samples/Dashboard/Formatting/formatting.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Tableau Formatting Sample</description>
-    <author name="tableau" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.1</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples-Typescript/Formatting/formatting.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/Formatting/formatting.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Samples/MoveAndResize/MoveAndResize.trex b/Samples/Dashboard/MoveAndResize/MoveAndResize.trex
similarity index 94%
rename from Samples/MoveAndResize/MoveAndResize.trex
rename to Samples/Dashboard/MoveAndResize/MoveAndResize.trex
index 0583a8d2..f3bbe2cd 100644
--- a/Samples/MoveAndResize/MoveAndResize.trex
+++ b/Samples/Dashboard/MoveAndResize/MoveAndResize.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.7</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/MoveAndResize/moveandresize.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/MoveAndResize/moveandresize.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples/MoveAndResize/moveAndResize.js b/Samples/Dashboard/MoveAndResize/moveAndResize.js
similarity index 100%
rename from Samples/MoveAndResize/moveAndResize.js
rename to Samples/Dashboard/MoveAndResize/moveAndResize.js
diff --git a/Samples/MoveAndResize/moveandresize.html b/Samples/Dashboard/MoveAndResize/moveandresize.html
similarity index 93%
rename from Samples/MoveAndResize/moveandresize.html
rename to Samples/Dashboard/MoveAndResize/moveandresize.html
index 6d33ae6b..ac797ac5 100644
--- a/Samples/MoveAndResize/moveandresize.html
+++ b/Samples/Dashboard/MoveAndResize/moveandresize.html
@@ -21,7 +21,7 @@
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-  <script src="../../lib/tableau.extensions.1.latest.js"></script>
+  <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
   <!-- Our extension's code -->
   <script src="./moveAndResize.js"></script>
diff --git a/Samples/Parameters/Parameters.trex b/Samples/Dashboard/Parameters/Parameters.trex
similarity index 95%
rename from Samples/Parameters/Parameters.trex
rename to Samples/Dashboard/Parameters/Parameters.trex
index 0a57b6e2..b85e0b7f 100644
--- a/Samples/Parameters/Parameters.trex
+++ b/Samples/Dashboard/Parameters/Parameters.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.8</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/Parameters/parameters.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/Parameters/parameters.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples/Parameters/parameters.html b/Samples/Dashboard/Parameters/parameters.html
similarity index 95%
rename from Samples/Parameters/parameters.html
rename to Samples/Dashboard/Parameters/parameters.html
index 62ede1b1..ad0a71a5 100644
--- a/Samples/Parameters/parameters.html
+++ b/Samples/Dashboard/Parameters/parameters.html
@@ -15,7 +15,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
     <script src="./parameters.js"></script>
diff --git a/Samples/Parameters/parameters.js b/Samples/Dashboard/Parameters/parameters.js
similarity index 100%
rename from Samples/Parameters/parameters.js
rename to Samples/Dashboard/Parameters/parameters.js
diff --git a/Samples/ReplayAnimation/ReplayAnimation.trex b/Samples/Dashboard/ReplayAnimation/ReplayAnimation.trex
similarity index 94%
rename from Samples/ReplayAnimation/ReplayAnimation.trex
rename to Samples/Dashboard/ReplayAnimation/ReplayAnimation.trex
index 1eb4f638..19895b77 100644
--- a/Samples/ReplayAnimation/ReplayAnimation.trex
+++ b/Samples/Dashboard/ReplayAnimation/ReplayAnimation.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Replay Animation Sample (Javascript)</description>
-    <author name="tableau" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.1</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/ReplayAnimation/replayanimation.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/ReplayAnimation/replayanimation.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Samples/ReplayAnimation/replayAnimation.js b/Samples/Dashboard/ReplayAnimation/replayAnimation.js
similarity index 100%
rename from Samples/ReplayAnimation/replayAnimation.js
rename to Samples/Dashboard/ReplayAnimation/replayAnimation.js
diff --git a/Samples/ReplayAnimation/replayanimation.html b/Samples/Dashboard/ReplayAnimation/replayanimation.html
similarity index 92%
rename from Samples/ReplayAnimation/replayanimation.html
rename to Samples/Dashboard/ReplayAnimation/replayanimation.html
index 0b6742bc..ba531b88 100644
--- a/Samples/ReplayAnimation/replayanimation.html
+++ b/Samples/Dashboard/ReplayAnimation/replayanimation.html
@@ -19,7 +19,7 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
     <script src="./replayAnimation.js"></script>
diff --git a/Samples/Settings/Settings.trex b/Samples/Dashboard/Settings/Settings.trex
similarity index 95%
rename from Samples/Settings/Settings.trex
rename to Samples/Dashboard/Settings/Settings.trex
index 0d32a97a..d9c7ed94 100644
--- a/Samples/Settings/Settings.trex
+++ b/Samples/Dashboard/Settings/Settings.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.8</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/Settings/settings.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/Settings/settings.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples/Settings/settings.html b/Samples/Dashboard/Settings/settings.html
similarity index 96%
rename from Samples/Settings/settings.html
rename to Samples/Dashboard/Settings/settings.html
index 3fc3948b..20ea384b 100644
--- a/Samples/Settings/settings.html
+++ b/Samples/Dashboard/Settings/settings.html
@@ -14,7 +14,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
     <script src="./settings.js"></script>
diff --git a/Samples/Settings/settings.js b/Samples/Dashboard/Settings/settings.js
similarity index 100%
rename from Samples/Settings/settings.js
rename to Samples/Dashboard/Settings/settings.js
diff --git a/Samples/UINamespace-sandboxed/bootstrap.min.css b/Samples/Dashboard/UINamespace-sandboxed/bootstrap.min.css
similarity index 100%
rename from Samples/UINamespace-sandboxed/bootstrap.min.css
rename to Samples/Dashboard/UINamespace-sandboxed/bootstrap.min.css
diff --git a/Samples/UINamespace-sandboxed/bootstrap.min.js b/Samples/Dashboard/UINamespace-sandboxed/bootstrap.min.js
similarity index 100%
rename from Samples/UINamespace-sandboxed/bootstrap.min.js
rename to Samples/Dashboard/UINamespace-sandboxed/bootstrap.min.js
diff --git a/Samples/UINamespace-sandboxed/jquery-3.2.1.min.js b/Samples/Dashboard/UINamespace-sandboxed/jquery-3.2.1.min.js
similarity index 100%
rename from Samples/UINamespace-sandboxed/jquery-3.2.1.min.js
rename to Samples/Dashboard/UINamespace-sandboxed/jquery-3.2.1.min.js
diff --git a/Samples/UINamespace-sandboxed/uiNamespace.html b/Samples/Dashboard/UINamespace-sandboxed/uiNamespace.html
similarity index 100%
rename from Samples/UINamespace-sandboxed/uiNamespace.html
rename to Samples/Dashboard/UINamespace-sandboxed/uiNamespace.html
diff --git a/Samples/UINamespace-sandboxed/uiNamespace.js b/Samples/Dashboard/UINamespace-sandboxed/uiNamespace.js
similarity index 100%
rename from Samples/UINamespace-sandboxed/uiNamespace.js
rename to Samples/Dashboard/UINamespace-sandboxed/uiNamespace.js
diff --git a/Samples/UINamespace-sandboxed/uiNamespace.trex b/Samples/Dashboard/UINamespace-sandboxed/uiNamespace.trex
similarity index 100%
rename from Samples/UINamespace-sandboxed/uiNamespace.trex
rename to Samples/Dashboard/UINamespace-sandboxed/uiNamespace.trex
diff --git a/Samples/UINamespace-sandboxed/uiNamespaceDialog.html b/Samples/Dashboard/UINamespace-sandboxed/uiNamespaceDialog.html
similarity index 100%
rename from Samples/UINamespace-sandboxed/uiNamespaceDialog.html
rename to Samples/Dashboard/UINamespace-sandboxed/uiNamespaceDialog.html
diff --git a/Samples/UINamespace-sandboxed/uiNamespaceDialog.js b/Samples/Dashboard/UINamespace-sandboxed/uiNamespaceDialog.js
similarity index 100%
rename from Samples/UINamespace-sandboxed/uiNamespaceDialog.js
rename to Samples/Dashboard/UINamespace-sandboxed/uiNamespaceDialog.js
diff --git a/Samples/UINamespace/uiNamespace.html b/Samples/Dashboard/UINamespace/uiNamespace.html
similarity index 96%
rename from Samples/UINamespace/uiNamespace.html
rename to Samples/Dashboard/UINamespace/uiNamespace.html
index 8fa6e943..e239887c 100644
--- a/Samples/UINamespace/uiNamespace.html
+++ b/Samples/Dashboard/UINamespace/uiNamespace.html
@@ -14,7 +14,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
     <script src="./uiNamespace.js"></script>
diff --git a/Samples/UINamespace/uiNamespace.js b/Samples/Dashboard/UINamespace/uiNamespace.js
similarity index 98%
rename from Samples/UINamespace/uiNamespace.js
rename to Samples/Dashboard/UINamespace/uiNamespace.js
index c627c5cd..802c15fb 100644
--- a/Samples/UINamespace/uiNamespace.js
+++ b/Samples/Dashboard/UINamespace/uiNamespace.js
@@ -38,7 +38,7 @@
     // This uses the window.location.origin property to retrieve the scheme, hostname, and
     // port where the parent extension is currently running, so this string doesn't have
     // to be updated if the extension is deployed to a new location.
-    const popupUrl = `${window.location.origin}/Samples/UINamespace/uiNamespaceDialog.html`;
+    const popupUrl = `${window.location.origin}/Samples/Dashboard/UINamespace/uiNamespaceDialog.html`;
 
     // This checks for the selected dialog style in the radio form.
     let dialogStyle;
diff --git a/Samples/UINamespace/uiNamespace.trex b/Samples/Dashboard/UINamespace/uiNamespace.trex
similarity index 95%
rename from Samples/UINamespace/uiNamespace.trex
rename to Samples/Dashboard/UINamespace/uiNamespace.trex
index 45169297..7cfe4d0a 100644
--- a/Samples/UINamespace/uiNamespace.trex
+++ b/Samples/Dashboard/UINamespace/uiNamespace.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.10</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/UINamespace/uinamespace.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/UINamespace/uinamespace.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
     <context-menu>
diff --git a/Samples/UINamespace/uiNamespaceDialog.html b/Samples/Dashboard/UINamespace/uiNamespaceDialog.html
similarity index 94%
rename from Samples/UINamespace/uiNamespaceDialog.html
rename to Samples/Dashboard/UINamespace/uiNamespaceDialog.html
index dd5b98c2..2b53b2ef 100644
--- a/Samples/UINamespace/uiNamespaceDialog.html
+++ b/Samples/Dashboard/UINamespace/uiNamespaceDialog.html
@@ -14,7 +14,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.js"></script>
 
     <!-- Our extension's code -->
     <script src="./uiNamespaceDialog.js"></script>
diff --git a/Samples/UINamespace/uiNamespaceDialog.js b/Samples/Dashboard/UINamespace/uiNamespaceDialog.js
similarity index 100%
rename from Samples/UINamespace/uiNamespaceDialog.js
rename to Samples/Dashboard/UINamespace/uiNamespaceDialog.js
diff --git a/Samples/VizImage/VizImage.trex b/Samples/Dashboard/VizImage/VizImage.trex
similarity index 95%
rename from Samples/VizImage/VizImage.trex
rename to Samples/Dashboard/VizImage/VizImage.trex
index 684f9612..68e3ba69 100644
--- a/Samples/VizImage/VizImage.trex
+++ b/Samples/Dashboard/VizImage/VizImage.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/VizImage/vizImage.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/VizImage/vizImage.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples/VizImage/vizImage.html b/Samples/Dashboard/VizImage/vizImage.html
similarity index 96%
rename from Samples/VizImage/vizImage.html
rename to Samples/Dashboard/VizImage/vizImage.html
index 54b88c6c..de8a1984 100644
--- a/Samples/VizImage/vizImage.html
+++ b/Samples/Dashboard/VizImage/vizImage.html
@@ -14,7 +14,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
     <!-- Extensions Library (this will be hosted on a CDN eventually) -->
-    <script src="../../lib/tableau.extensions.1.latest.min.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.min.js"></script>
 
     <!-- Our extension's code -->
     <script src="./vizImage.js"></script>
diff --git a/Samples/VizImage/vizImage.js b/Samples/Dashboard/VizImage/vizImage.js
similarity index 100%
rename from Samples/VizImage/vizImage.js
rename to Samples/Dashboard/VizImage/vizImage.js
diff --git a/Samples/VizImage2/VizImage2.trex b/Samples/Dashboard/VizImage2/VizImage2.trex
similarity index 95%
rename from Samples/VizImage2/VizImage2.trex
rename to Samples/Dashboard/VizImage2/VizImage2.trex
index 506eecc2..60e6def2 100644
--- a/Samples/VizImage2/VizImage2.trex
+++ b/Samples/Dashboard/VizImage2/VizImage2.trex
@@ -7,7 +7,7 @@
     <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>1.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Samples/VizImage2/vizImage2.html</url>
+      <url>http://localhost:8765/Samples/Dashboard/VizImage2/vizImage2.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAlhJREFUOI2Nkt9vy1EYh5/3bbsvRSySCZbIxI+ZCKsN2TKtSFyIrV2WuRCJuBiJWxfuxCVXbvwFgiEtposgLFJElnbU1SxIZIIRJDKTrdu+53Uhra4mce7Oe57Pcz7JOULFisViwZ+29LAzOSjQYDgz1ZcCvWuXV11MJpN+OS/lm6179teqH0yDqxPTCyKSA8DcDsyOmOprnCaeP7459pdgy969i0LTC3IO/RQMyoHcQN+3cnljW3dNIFC47qDaK3g7BwdTkwBaBELT4ZPOUVWgKl4ZBnjxJPUlMDnTDrp0pmr6RHFeEjjcUUXPDGeSEwDN0Xg8sivxMhJNjGzbHd8PkM3eHRfkrBM5NkcQaY2vUnTlrDIA0NoaX+KLXFFlowr14tvVpqb2MICzmQcKqxvbumv+NAhZGCCIPwEw6QWXKYRL/VUXO0+rAUJiPwAk5MIlgVfwPjjHLCL1APmHN94ZdqeYN+NW/mn6I4BvwQYchcLnwFhJMDiYmlRxAzjpKWZkYkUCcZ2I61wi37tLbYyjiN0fHk5Oz3nGSLSzBbNHCF35R7f6K1/hN9PRhek11FrymfQQQKB4+Gl05P2qNRtmETlXW7e+b2z01dfycGNbfFMAbqNyKp9Jp4rzOT8RYFs0njJkc2iqsCObvTsOsDWWqA5C1uFy+Uz/oXJeKwVT4h0RmPUXhi79vuC0Ku6yOffTK3g9lfxfDQAisY516sg5kfOCiJk7HoLt2cf9b/9LANAc7dznm98PagG1fUOZ9IP5uMB8Q4CPoyNvausapkTt3rNMuvdf3C/o6+czhtdwmwAAAABJRU5ErkJggg==</icon>
   </dashboard-extension>
diff --git a/Samples/VizImage2/vizImage2.html b/Samples/Dashboard/VizImage2/vizImage2.html
similarity index 97%
rename from Samples/VizImage2/vizImage2.html
rename to Samples/Dashboard/VizImage2/vizImage2.html
index 0b30e9af..0f73e342 100644
--- a/Samples/VizImage2/vizImage2.html
+++ b/Samples/Dashboard/VizImage2/vizImage2.html
@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" >
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" ></script>
 
-    <script src="../../lib/tableau.extensions.1.latest.min.js"></script>
+    <script src="../../../lib/tableau.extensions.1.latest.min.js"></script>
 
     <!-- Our extension's code -->
     <script src="./vizImage2.js"></script>
diff --git a/Samples/VizImage2/vizImage2.js b/Samples/Dashboard/VizImage2/vizImage2.js
similarity index 100%
rename from Samples/VizImage2/vizImage2.js
rename to Samples/Dashboard/VizImage2/vizImage2.js
diff --git a/Tutorial/.vscode/settings.json b/Tutorial/Dashboard/.vscode/settings.json
similarity index 100%
rename from Tutorial/.vscode/settings.json
rename to Tutorial/Dashboard/.vscode/settings.json
diff --git a/Tutorial/Manifests/Tutorial Complete.trex b/Tutorial/Dashboard/Manifests/Tutorial Complete.trex
similarity index 98%
rename from Tutorial/Manifests/Tutorial Complete.trex
rename to Tutorial/Dashboard/Manifests/Tutorial Complete.trex
index be5e6003..e22946ea 100644
--- a/Tutorial/Manifests/Tutorial Complete.trex	
+++ b/Tutorial/Dashboard/Manifests/Tutorial Complete.trex	
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Demonstrates getting the selected marks and responding to user input</description>
-    <author name="projectfrelard" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Tutorial/Part_6/MarksSelection.html</url>
+      <url>http://localhost:8765/Tutorial/Dashboard/Part_6/MarksSelection.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Tutorial/Manifests/Tutorial_Part_0.trex b/Tutorial/Dashboard/Manifests/Tutorial_Part_0.trex
similarity index 98%
rename from Tutorial/Manifests/Tutorial_Part_0.trex
rename to Tutorial/Dashboard/Manifests/Tutorial_Part_0.trex
index 1d2eece3..c3b51512 100644
--- a/Tutorial/Manifests/Tutorial_Part_0.trex
+++ b/Tutorial/Dashboard/Manifests/Tutorial_Part_0.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Demonstrates getting the selected marks and responding to user input</description>
-    <author name="projectfrelard" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Tutorial/Part_0/MarksSelection.html</url>
+      <url>http://localhost:8765/Tutorial/Dashboard/Part_0/MarksSelection.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Tutorial/Manifests/Tutorial_Part_1.trex b/Tutorial/Dashboard/Manifests/Tutorial_Part_1.trex
similarity index 98%
rename from Tutorial/Manifests/Tutorial_Part_1.trex
rename to Tutorial/Dashboard/Manifests/Tutorial_Part_1.trex
index f5182477..4e2a607b 100644
--- a/Tutorial/Manifests/Tutorial_Part_1.trex
+++ b/Tutorial/Dashboard/Manifests/Tutorial_Part_1.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Demonstrates getting the selected marks and responding to user input</description>
-    <author name="projectfrelard" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Tutorial/Part_1/MarksSelection.html</url>
+      <url>http://localhost:8765/Tutorial/Dashboard/Part_1/MarksSelection.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Tutorial/Manifests/Tutorial_Part_2.trex b/Tutorial/Dashboard/Manifests/Tutorial_Part_2.trex
similarity index 98%
rename from Tutorial/Manifests/Tutorial_Part_2.trex
rename to Tutorial/Dashboard/Manifests/Tutorial_Part_2.trex
index c238c3bc..da1e9502 100644
--- a/Tutorial/Manifests/Tutorial_Part_2.trex
+++ b/Tutorial/Dashboard/Manifests/Tutorial_Part_2.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Demonstrates getting the selected marks and responding to user input</description>
-    <author name="projectfrelard" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Tutorial/Part_2/MarksSelection.html</url>
+      <url>http://localhost:8765/Tutorial/Dashboard/Part_2/MarksSelection.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Tutorial/Manifests/Tutorial_Part_3.trex b/Tutorial/Dashboard/Manifests/Tutorial_Part_3.trex
similarity index 98%
rename from Tutorial/Manifests/Tutorial_Part_3.trex
rename to Tutorial/Dashboard/Manifests/Tutorial_Part_3.trex
index f2cf1625..49a1d63d 100644
--- a/Tutorial/Manifests/Tutorial_Part_3.trex
+++ b/Tutorial/Dashboard/Manifests/Tutorial_Part_3.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Demonstrates getting the selected marks and responding to user input</description>
-    <author name="projectfrelard" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Tutorial/Part_3/MarksSelection.html</url>
+      <url>http://localhost:8765/Tutorial/Dashboard/Part_3/MarksSelection.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAq9UlEQVR42u19B1hUZ/Y3Mdn9f1u/3dTN7ubL7n9NYmFmAPvGJJoYjV3QmTsDih0p00BQLIAl9m7sDQQRG6hgAZFmQUBUQEERQbEgahQLdvB857zD4J2hTVVMuM/zPigww5172u90G5umq+lqupqupqvparqarjf3estGLP7tf3yHfChSSO1FCs5JqJL5idSy9XZqWZKdQnLeTs7dxHPXzosrF3lJnuC/dY5ITt+TPMSv9/D8jP++JFJymXYqWZSdymWuQMm5CZXS70Q+3OfNFS5/tunS5R32d5uu13SJxW+3QqJ/4Nnlj628B7YW+nCuQpVkuUghSbdTcHeQyJV2XhKw1KH3q2KOEwIVt0roLR3ZYryL4P1x/f7UKkj8W7qfJqJY+wrq8o7Qd8gfhAqnf7ZScv0FCm6VnZLLtSPptSCxDT/cU9QS5wRK6XpkCnFLL6dPW3mK/2jj1uY3TcSyoHoXDunOiG7rw/VBFb9OqJAUi+Rc5esheh2H7kfOXUPzs0mocBlUzQxBNs2aSGjKhTa2hZfje595iu2EKulEfLAnUNKf162ixUgEPEop2KudoY3vEGjnPwzaB4yEjoGjoONUNzxjoOM0d+jEjofecdf8DH+n0xT8vaDR+NrR0G7SCGgzzhXajB0MiCcA8QSZAxB5iutkBns5V4FmKBcZdUYrhbh9c4X4A9JeTUQ1kPAt3Zw+bq2UdEX1uholvbRWgjMCiDXEkHMaovsNgbaThkOHKW6MoP+d7mGxQ+9H79t2soYhHJAZEA+we7DzrJshCFAiAwfbeom//0Le7+9V4LHpqk3Vt1QP/thWJf6e1Cg+uAe1EZ1JOv1fyYGDbxXBgyxPcEMOaZT2k0eitnEFO5VUw4x1a4eHyNARreWSHl/IpX9vMg28S+Dv/NfWasmXSNS1+ADLa5V2lDa0/0h0F6aWO6KaftUEr5cZkAE1zDAERCpOc79edTGCBEGj5Gsycb9uyiNaFnnLWgvV0gmoxq/WKvGo3tGfh7bjhqJddmtURK+TGaaMhrbjh73EDLVoBNRy14VySZCtSiZkbuSv7RK6O35oq5Q6ChVcPD6QCn1Ax+y6jzO0nTCMqdo3gfA1GWEMtJ04nMcINWMLqPVSbOVSjszfr8SXD2rWUsnZihTiqagmS/gBG62qJ0DXDh9cx2lvJuFrmgcNI9irXRhw5GsE/PcLdB9vCZTcnFbuA+1/0SDxY7c+v7dVcN1R6iMRPT/CB/CCJw1gj0Cq7XjXXwzha4JGd2jjP1SjEeQ1zN0ToZzb10ou7tdc0fPPv0yVr5CMQNV+Aon9TEfqFYjo0YXr8IbYePNNgxt+XlewR09GFx+InyMuyLNVShQU+PrFEN/Wj/sPgp5A/HDFOiqfvhLAmzAc3bgxr8WVe51eA5k5O29nHW1QlXO4jlpyrhBN5Rvv2zsgykXi/4Qf6qaIr/LJ1o8dDO0DRkHH6b8ewusHl9oHjWbxDNKCPJPwAp/VHRSYEKGHpCM+xzcwZhBk00zgJe4kUkjC8APd0VH5So2try9i12vBWAiKXA5hR3bA7hN7YUdGNPx0IBRGrf8RusxUNFqi9lvoBxO3L4GQQ9tgZ2YMRB2PgRUHw/B7S8FlZSB89aNnDSYgk9DGf1hVMEnM1wb3ESDuFHoN+u7NCiUT8VWSrxHUROIHuqdDfJUzU/l1uXZfTvcE6YoAiMuJh+JbZ+Dh42KAyutQ8fwa/HyvALIupUPo4e0wdM3URkX4LrMU4BuxEPZmxUJhaQ6UP7oElRUlUFFxDe48KISiGzmQWZgK65O2QLc5ypraYKrWU3DWmEbt8ZSUi7y4OIFS0uvNyDIi8Vsrnbqi5O/GD/KA79vbo71rN2kks391Pcje88dCbFYcPHt2lRFe/7yoLIF75UVw9Pwh8Nm8oFEQ/4f5PrA0biPkl5yCJ08v13rf2nMg5wD0mOdTu0lAL4GSVw5oGkW6gaNH+P/E1p6Svo2bCZD4LRTib/Bmo2sQ38eFfbj6gB5J//C101B6iut9iHSeIoOcuXIcxm9dXEOtvsrTB1X+mqTNUHrnLJP4hu675PZZUITNZZ+1zqRT0CgNLvDieG6i5DEKVaKtQtq7scYK3hKoZZ0Q3EXpEF+OLp4Pgr3AUdCpAbDXZaYcZsasafAhas9zNAv5104y+/rVDK9XT/wFfrAuKQJu3j3PNJOh97375D40Gcq6wSGeDgQO0TUW8eMFcskjNKsHBArnbjZim8ZVgdSK8vZySTja+ft8ySdOJo42xMXrNkcNURl72EOqROI+fngJT/3agLDBRbSvs2JWs9e/UuInR8Cte/UT//nTK/Co/CL7+qJKQxiitTSaYDRLcYvkeskkBRdNyTObxlKT2Mpb3FyoEK/AmyvTUfvk5hlIfIb80ZaeuXwcnjy6DCdPHIWdUVGwa9dOSDgYC/lnj8PDBxdrZwIEWjfKzsG2tF0gWT7R6sSXrQxAdL8H7ty/UCvxK5+XwPVruXAsNQliYnbDzshI2L8vBm7fymdMMGP3KuhsgNliHkKVJtCLFTyglPkXqoHC1078f6tkHwkU4qnk5+tIPhK/Q+Aoo4I7Tkv94e6DC/jw8iAsNBzWbwiFDRvCICQkDMLDI2Dfvj1wqSiLaYfawOGDxxch5WwSuAXPQJNgOVwwYPF4mBW9Ghbs2wCbU6Mg90omwym1Ef/unUJIPZoE27Zth40bw9n9b1gfyk5yUhxjbo+QGYgBjChEYbECXWCIz7tMpJAubDnW+dPXRvyPfLv/QaAYNEYoF1/RBnko48UAX+DoBm2+/nFGybpZlg/37xZBcnI8rF+vYQD6qv33tm3b4MzptDqZ4Amq2utlZ2F9yhZwD54JXhtnw0b0ySmm0HWWJn5AsQRu+eRa76H7XG9Uz146ZmnB3vVM2u+VF6JbegnNTu0q/8b1s3Agbh8jvPaetfcdEbEVLhaegopn12Du3nVGAVeGCVCY9LwDChbdsJVLfAUezn99DaVbNu8QIkVQkq0N7zK1r5ZBu8kjWZ2dcZLmDtLlk5gb9aj8EpMi7cPTHu0DpYeZl5tRp90lRqD4AfnfdxjRihnxzl7NhAulWXD7fgE7ZDb0z827+XDtdh5kXUyH9IKjcB5du/sPLzYI8spuFzBTRdpqwwa9+8b/b0SNdrP0LDMBd/Bvd5+rNr4kDYWKXGlt/oAyiShwF2zlYo76Il4p/VvLOZFAzsXY8RI7LMJHadypxod2CcVPiVrOHjQ9pPt3C+HIoYN1MsHOnVFQfDHbYORN70tYgU5DxGS/ixqGnYprDXsjqHXSjiVBcHAYrFu3sdZ7vlKcg9J/lX02ev++i3xNCB17MOGyU0v5SaQKoUKS3MprYIdXifj/JlRKZ6LkP+a7e23HD2URLVPsbLfZSjiUl1j9UB+iFjh6JLGGKq1mApQq+vmj8mKDmcBaJ/dMBkRs3sqIrz38+96xIxJu3jjHwKH2Nf0W+ZmcRKIiGZFSJ0bwVKCQLLP1kX5ifer37Pk/tiopZ6cH+gjxd5hqejqXAiNkm18i6WtQgkh6164oRuiMtJQakrVpU0S9puBVHDJXh1LidQhODBAXuw9OnTyCnkwknDh+mLmzL3iBou9mq8wqRnUYp+seojDeFSgHDbfx7vQ766r+MZxIqOQOsUqWqvi+vUrGkKq56dye83zgFNpeelBldwpQrSYzyblReo55ALWp1vS0ZHj25PJrlP50xoj690bmICf7GJTfL4LTOWlorrLQVLwMb387W2lmFtEN7BBs8/EAmoLM1p5cO6sR/x9eju8JVNxUnb47hbQqn29+SrfX/LGQceGoxk5SIgUR85XLp2H79h11YoEjhxPqjA+8ipOddawa9fPvj93julDGxGTO+IEgOj3n+5iXSp5OeGAE2OPz59cSoHDO+Y+744eWp75Y/La9UvqdvZy7pRvpczUJ9NWWTQuIXKYLxvCB3SsrhJSUg9UxAT4DhIRsQilLe60m4Erxadi9e1cNnKLVApd54I//uqFrpphfT4Cek74pQNNchuC8p8XzBVSihMAvVCe1q7aM6ie/e9quVTXROD60B/eKIDU1CUJDN1cFVbTED2OBFXK/XjsIRBxCrikxKZ9RD8bvhxvX85gmq5EPyNwL38yUm80EVFNBdOCXlgkV3DbqTbSg9Lf6LXXjosQ/4dW1MzRqiUhb97k+zEev7eE+e3IFck+n6wSFSLLi8eHeupn/2onPQtFI4OxTR2Hz5ggdJti3Lwbu/Hy+hvRrD2U+LfH82qEJttM1BU8pNtAcAbtF6P8fz/6faCp5edLvLas3r2+UCzhHBXtO7q/j4V6FgvwTjOha4sfG7oXS62cbBfFfxgKuwonMIyxkrQ0EEZPeLbtQJwNocgKWqTbmA8Iqtzy2hXrAv8ynfps2v6FqFCpKeAn8OBbwsQTxSQ0GRa2AZ8+u1PqQKHael5vOVCwRf+/eGAYMGxPxtecx3mt6ejJsQiYIDQuHyB07qqN/tbqQT4pZuPq/FqiJZAEi3brCZyJ015v3bG6eFiBEKVBwYdX2xWsQK1uyhPRTRozKqB4/qT2YQ7GAOz8XQOrRRAgL28yIT6CqMRK/mgnQ309LS0LXcDNER++Ci4VZzIzVxQQFpVnQY563BQChR1WugKcFFNIYkbv4H+bQvxn6lh1RnZRZQ/r7Lx4PN8ry6yY+ArzDKfEM7e/fvwcuN1LJry04lJ6WgphgC+xAF/ZSUXYNN5Cfyh67eb5lsABqARFPC4i8uMdCpfgHmyAb0zwCmr8jUMlmvXzDQSzZY4nOXJL+hbHBtcfiq3IBJPkUZElMjIPSkrw3gvjVJWuPr0BWVipERUXB3j3R7P5ry2BSGVlyXiL0NTE0rB8gYskivhZQchv+pR7wF9NcP7n43zQDh9/I0dbfMsh/2NopcP9hUZ3SX1qiSa2ePHGExQLeJOLzvQOS/uSkeBayJlNQq6eDQJfK37+fa35FU7uJI/RDxDdoiJbx1UMI/oRKZykbd6Jt1UZXo4NFpN8DYnNi6yyiJA1A4I9iAG8i4WvTBsTEtcUD+IBw3r4NOrUIpuYJavQXeHNyo8Hg+yP6/UmolG7Xr/KxhPSLl01kdfPGFFL+0g8Jw4Xr2fDdbPO1gIP/UN3qIaX04P/z6G1c0UhL5cDPEFDc5LdytZ80wgJunwLCjkbC8+dXmwivxwDX75wDv4hF5kcHg0az9DyPdg9aqcV2hpsBsc3bArV0mF11mRe1c8ksMqhBHjoH7jy40CT9dVQ4n758HNxDZlocDKIr72NwfoAmcApVsnB+5I8mY5lLfEqBJuclNUl/fXgB3cXks0nguNTfrGdNxTl8BhAquNh/ig2sFfint/hdfEEx3/63mzzKbAagki+qr2sidP2HnhH1HNTVPWSQGQgcBUL9cXWjDJs50Iw6fLRzezToX2K2+h+xbjqqtwym5pqI3DAeyCnOMKtohCK1IpVUp+Vc4OPcy7BSb6XUW7+vz5yU7/A10yA5N5GVbDcR2LBz424+TN21wjxvgHoJeAkiWyX3Y4OzBljwRyHZyp9f0wbtiak34bhkPMSdjofHr7Fs6008hJMyC4+BbGWg6ThgwnAdd1Ao5w42ONVcpBR3Rhciv3rurVJqlv2nVmgq82oCfsYfaoMPObzdZCxAzTlC3RTxdRu3Nr+vXwN4y4YiYHhYzQCo/qnqxORqnxmekFZwmHXyNhHVeCxAAzHEyyaY7A4KFTpDKp//r3LgZ/UygJ23bC5/lg+5f53MsEPqTfOg+OZp/DBNBDUlLpBZdIy1zJn6/NlIOr4Z8JX1rZ8BlNI9/Be0MyP1S/1vCbkJ8PTZ6wF/VC5+7copOJl5AM7mHoKnjy+bGMsvhktFx+EEvs/Fwgwov19YZ37f0hqAxsr0NqOCWDNogscAaqlv/Qyg4HL4L+gQMNoMJOoO+7NjGxybYrEHhhJThATasnk1+Hi7Q4/uXaFtGxHYtm4BImFr/J4H3L1z3qj3fPigCLZtXVv9Pg72Aviua2cY4+YK69YsgLwzKYxBrPWZSsvOwayYtWYAwWG6DKDgljfEANf4L+hohv2nrF8Sun9Pn70aAEiSmZwYBdOmjIPevbrBP//xd3jn7XfgLZu32Pni88+gtMS4iqKfb+bB1Cl+1e/R7K1m8MH778G3Xb4EP18v2BkVwt7TWhqBzEBq/iHmTZkEBCeN0J1IquSi6/cCFC+HPDAGMLHmn4i/KDaYddy+qrg/FZDev1vACHKxKAPO5h2G9GP7IHpXCGwKXQ6nTsQb3UVElTwXzqfB9q2rIWrHejhyOJpJfdGFdCi5moUaJZ+ZFmuahOziDJCumGyyJ6AzqVwlS6+fAXgegIYBTI8ALj8YxvrqX29RxlV48qiYjWmhfLwphKL3oHE19D61NXlYFcfg34s/cxC+nmFaDwFpcB0GUHJFDTGAzgYucyKA8/euh1t3zzcherOA4DVIO38YeppYOMpKxnVrA0rrxwBy7pkOA5jR9rU+OQLulhc2EdKMQ9rm2s95MDN6jWmxAD0GoNH09TOA3vIG4yd9vDykup49a4r/mw8ES9jk1M4mzEOkpJD+Eqv6TYDexk1TTQA1e1Isu6nwwwJaAJ/h4XMpRo+V0UYD9baU3H4lDDBt10o2FfNNULH6pzEywLGCw9Bv0TjTooG6JuCOkQxgWq/fpiM70P433qpeChoRqr91IxfduiNw7Uo23CzNZS4dlW/X183zqs/V27nw4+6VJvURGq0BKGFgrgag7BV5ABQDaKzEP3UyEfzG+sA43/GwaMFiWLZ0OaxdvRbWr10HYRtDYGvEBrh6OatRMAFVUG9JjYKvZnhYHwPgLz01lwEcl/jDgdMHG2UNABH0YuFxcBowEFYsWwFpqWlwPP04ZGZkspORlgHJicn4s5Xgo1bCnZ/PGREvuMZ6AJ4/vWZxxkm/cNSkaKDxXoB+IMiEBU4UtKDyb0pkWKvjhpow6dTXbFGX9Ht5jIHu3XqAs9QFpX0T7NuzH+Lj4tmJ3hUDs2fOht49+8JAx4GwOXyNQcSk9716OQcy0lOgsOBkjaFQ5hWHXIO0giMweFWg+RrAgDjAXUtEAnsv9IXsS+lWkWBquT58OAGSEuOg4PxxFuUzJrTb4/vu8N5f34P33n0POv/3a+jXZwASWwzigRIkfB8QCezg3b+8C59+8in4+ihr7emrUcJVmgfbtkXAihVrITh4ExRdOGXQ6ww5JXfOwtqkCJPGytSMBEobiAQquOuWSAYNWjqBDX62xiCGUyePslFsP06fDRPGo7mJ3cESQYYywIfvv1+d3Pk///M76NOrH2OCvr37w7ddurGED/3snWbv4Pd6NEhICg9v3xoC4/38Ycni5WyQxdncDJ2pYOacy7fOwNSdK5hrbXwuYJR+LiCtoWxgvk46ONC0dDANbC64nmWVPjuaxLF2bQgEBk6DwS5DYYzbGIjbv53F6w1hgE8/+QQJ3Iydv/zfv+gwQLdvv4c//O4P0Ax/9vvf/Q6GDuF0BjzWSqBLJ2DalMng4zOOaQBigPxzmRZjAAKBm49Gmj44gm8CVNLdDRWEJPNf0H7SSNPiAFEr2cxda2kAYgDSAkuWLEcG8ETpGwvZp5KYNDZkqzmxGD7+29/xfAxdvu7KCK9lgF4/9IE29m3hbx9+DG0d2qA3sK6BWQAXYWPwCnAd7ApTp8xg90UzAUqu5loMA1BhSOKZBJMSQtTNrbuzWLqsgaJQ6Xr+C0xtB6d257rav8114c7nZ7K5AcQA9MAnTghE+y2FxQvnMH++vgdPP9sVFQaDnAYygmuJrz3a79HxUSuQkDn13EsJnDiegDjBG1TKsbB8+RoID9/C1D9pKksGgo6wSKC32RVBIpVkbP0MgL/AX+lKHcGdTEwF00Ruq1TLlhWynnstAyxGuzt6lAdD7RHha/Hn5xtgohJYunguSu0QJHp/dviE7993AIweOQLfa129GqW05DQsWjALhroOh5kz5jLwR1POabiFJd1Acqf3Z8VB34V+5tcEqhuoCRSpuD58V5DmAXUwwROwlhdQrQXQxm7Zso0xwerVG0CNEti/ryOMHD4cEuJ3sjEt9dcLXoGoHaHMdvuN9a4+/uN8Yc6sabB/71Z48uhSvdVHO7aFMNU/zncCrFkdDPv2xrCdAZaOAdBKnMDI5WyXorlVwf/xFjdvcAw8vy+ARsC3CxhpUjDotBW8gJcEuMhGyNDkMNIC06bOBGfZEJTgfogHfCDrZGKD1T9EqNu3zqLKPsLCwXQKCzKYBqmPiMQ86cdiWaDIdfAwmDVzHmzdug0uoP9vbFzCkEN9FT3nj0UM4GVWXwC6+CUN9gV8Plb2vkgh2cKfC2BKZxAFLc5ePWnViN5lGtO6SzOmldA3gUGtGp8+NYAxwRMDVtCxiSS3zsFzA3IXBEKJUaYGTQLH/gNRa/jDmjUbIDU1kTGlNT5resERll8xGgBO1OsMUnAHGuwMsnFz+43Qm1PxW8PtvY3vDaQ1qZmF1u0IevbkKlsuFboxnGkBP1TFTgMGMbeOmGCi/zjYGRkGOVnJUH4nH17o+fNE+Ec3cqE0cRecnTMNLqxcCKUJUfCgMAOeIbrX1wJUIZyZEQ/TpwXAgH6OMMx1BMyZvYAtr6CFENbKG6SeP2zSWFkHP93eQIFaOs2QIRHNhD6SjuZ2BxPHbkjZAmUPLlhVC5DNJdtLWGDBgqWMKMQA2sOJpTDORw1pc6dDMbp0Nw5Gwc3k3VAaHwkXw9fA6emT4ciggRBv1xbi27SHI44DINtPDdnL5sH+3eGQeHAnJCfuhjM5hxB3pEFQwETohyCRSb8f2v41wSz8a4imMTUMHH/6oPndwXKuUjDWpafB8wHQX7xk7nyAEWuns3WqlVbMqBFKz85KZe4XMcEE/wB08TgdJhj8fS/Y3qYDJH3TBVKdnOCYRAxHHR0hofPXcIAIr3fi8AR37AyDxRyMGDYcbb0K9u3ZCqlH9oOL82CmXUYMHw3z5y1mq+2KL1lP+h88uggRqZEmjonRTQI1Vxg2H4BNCBEpZZt0JoT4uZqUFKKt37Rpy5oZvtu3zrP5wYQFflq6EkaNGMOIpGGAvjD9y28gxr5dDULXdXY5tAfvLt2gb5Up8UUNQtJPTECexkAnCYwfP4lJPwFRa66toarq1QnhRj/7NvoTQuSS/QZPCKEZQUKVzFVnRhCqE1MSQysSNqEZsG5hKCHvzOOH2Uh50gLkEcg4F02Qp2dfCGnXiUm1IcSn39uAvz+gZ5/qINGUwElw60YebAxexb5HDLZo4U9sT9C5vOMNhorNOVRVTf0Vxi6XstOfEaSSqY3aIcCmhPGXQ6A6MdYdpE1g8TkH4KmVW8M0WCAP9uyJZlpg1ar14OWhRKDmBF5du8MOVP+GSv9ulH5lV430E/FlnDOEbFiJrmIqagIfNC8SmDB+MgOdBw/GWnVfAZnO89dPsQZbY90/86aE1TUn0G+IkUBQDfuzYuscBm3pHMHhQwerx8rPm7sIBksHwzK05fuNkP7gtp2gP2oNrfQr5XLIP5vGQr6ug4ei9LuxyKNmX1GKxRI+tfYlPi6G6BP7jC4GdUD1L9SN/ycYPSdQMyZe6qw7KZQzKj1MGoA2e9Nq9VdR6VNUmAVRkVFsVj9J6AqlJ0T/t7PB0h+NOMHr2+46ySGKDNJOooy0A+hhDEfXMoCZGVoNez7/hFVLxmgr+dw960ybFOo56CUDqGUKk8bGCzyc/lfESw9TUKGdkVtCpu7UVAe/ivkAFP6lJQ20sSN4bTDk+rvB1cE94HCHhk0AeQOb0VT040k/ncDJ/iyxk5wYDW6j3GEpgkyS/sSEOKvPML504zR4bpxj/Kxg3RrAGy2VjrYmbRp/f8SXf0JfcjZ/WjglF4wBgx4hM8Fn80I4d+1knTt3LZkjOHYsCTZu3ASH5k6B+35SeK7oCyWybpDSvn29DLAXpZ/Zfh7xpRIZbFi3DEquZsOypQvAz9e/eikkJX2srf5jsw6AzIimUEra0UQXPfQfYrz65wWFWniJO9FSQv6+AGOGRnSZpWQDkHdn7rF6kSipYxrLnrQ1DC5PGgUV6gHwQt0fnsn7QG7PryDBoW7p34kMwJB/n5fq323UKDieHg9ZJ5NApVTDokXLGPFpeUXWqVSrqv+rP+eCatNcxFGGj4ojkG6nsy9A8lTgNbCXyfsCtBtDhEpJKH9jCLkYxm4MicqIYUENa3cKPbt2Cu6h1Dz1dmLEp1Op6gfl7r3gUB2mIBZPwNffskQSnwG8VVQVnI9McADGjPZkWUdigD0x0WyrqTU/R2FpjlGzgZj0jx2iK/1K6T6hocGfunMDNDZe+oOdF1fO3xNs7OgYamyYs3eNVYpEqk3A3XNQuXkOVPqJq4nPZ4K7I3+As72/hgR7XQbYh9I/kGx/n/46hSFDh7hC1I5NELd/B7i7eVWr/+SkAwaVn5kzHWxN4majagApUkuZW97+wOdCtUzWXGGBzWGfu4v/IVBIX2YIPcRVWMBwLfDtbAWrarXWvIAXjy9BZdRSqBwnqUF8PhM89eoDZSN+gGNfdtCx/9qwMd8DoFz/2tVLYcmiuTBxQoDOttIKK049oSJQJyN6AEgb2/sM1tsdKDnwGYJ4y+wN7NLlnZYKcW+0KeV8LNDGf6jRNQJx2fEW7xh+gcSoPBAMlZNc6iS+PiM89ugNaZ07Mvu/xaE9C/zw8wfEBGNGu8Gm0NWglKuq7T+tiT2eccgq9p+GQRTdyIGC66fYNnVj0r5W3RvIIoNuTh8L5NxqvRJj6Gjk5lBaFHXPgj2DrKEzLwEqF6qh0gDi62sDYoCJX3WtriPgM4GLbDAEBUwGlUJdbf81yZ9s6+Q07hfA4JWB0NuIyp8OtESawr56m0NbuFtiZyD/CrJpJlCIv0HJL9HdHTzE6FqBVQnh1VrgzgPzQqmVDy5A5Zb58MJ7gMHE5zPB+QFdq+P+fCYY7OwKO7ZFsq4h9zGeVfZ/IyQkxDZYbmbqmPiIY7uM3h3chu0O5qy/O5iliUf2eFcglwbodBAraY3cMKOYgH633yI/GLFuKniEzDZL+isTN0HlBJnRxNeeJ8gE4/z8YeWKVRC2MQw2Bm+EwMlBcOZ0HuSezmXBHyr41Nr/FASAlrb/5BlR0qfnfG+jUH+7SbQ9nNPdHi6XzPv3qH4fWW2FfAu5WCBSSJNoX311xRCagvYmLpEeuX6aSa4hI34Zov6IeSYTv1LVHyrCl0DF8wqofF7JvrLzrAIuFV1iqn/48NFM/ZMG2LJlK9v+ZemED8VHKGRujACR6nfwean6iR5I/BOtPbl2Nla9xK1+a6uUSFDV3KxOF1eZAlNmClOggzqInhkpVYwBjmyDyslDTGaACmSAW5dogtgjdsoflMOV4iuwbcs2Vlk0FI828UMMQGvsLKn+ifEpTxJ6eDubqmpMvx+tjbeT64R8UfUPGm7Tp4GiT0tctqp+H6GbMQNvgLdPWMLWlJgyVIpWp25B+0dMYOhY2RePi6EyeoXJxKfzWO3E6gaGDx3BVD1V+HISZxb0CQr6sQr4hVVtLg+FQykHLdbwSaVeFO0b9NMko2b/kOtN0z9FSp7q95Q8FaqkS2w9+39i86ouVj6u4KLtvMTPea3HLEBkiimg8Se0VILSxw8NCBm/+PkMVIbPNl3940mdpanqoQQPHersWV8V7NGuq9eurKcNoJcvWW5vMY1+c1kRYHShB7Xq0fZWHuqvQNCX1Eo1sIPNK73ENm+j79kbVU+OFhSyMCTeXPvJI02eLjZgyTgIO7qDJUPqZYDzKfBiiY/JDPBUPQCC1wVXE7muo2WG+AP769z8aQjCJ4mnPcEUDifAJ/5povHEDxyl2QbGs/uohQvI5yfTbPOqr4+GdP+DQMGNQSa4oh0xL6wqI28fMMrkAVPkB29P340qMq/O/AH5/i/mK02W/oJAD9iA0m4IA1DyJzPjsNHBH2JimvVL0z0Kb2RD7pXjsD4pgnk+xiyB0II+Fu3TnfdzQ6iU+go8nP9q87ouW5XsI2SCqSj9t14mjGjLqAt0MIMJaNHEkFVBsOnoTnx4OSxIQoygrTB+UZQKL1b4m2b7vZ1g0+o1sIGn5usiPlUYUekXFYUYQvQnVdJOyD42Ow5yLmeAPHQ2TN+1CgYsHm/SkKcOgW6sKJdPfDx3hXJucQu19F82r/vS1A9KVtrx0sZUQ8g8A1Rb5iycoM1Z1GSyKDYEzpWchCu3clmV8fO7+fBi2yLjpd/HEc7P9IHQDRt1VLz+Ccaf0fr3uNi9cO3qGYOkn1R9JjImLcg4kp/CNqW5rAyAriYMdngp+aM1xJfr+PsP7JSS8NY+jiKbxnK1VDs5COXiCLy5+7z99ayOsAOLEZi3c5AyY1IETZN3LIOdx2MgC9Xq7cil8MLHyXAGmCCFirUBcOJwPKQkH4D9+/fC3r0xEBO9G6J372ZtZnRiYnYzm5+TnQb3yhpOXlHV872HRWy9S0DkT7AqYROMXDfNrL1/WrXfBp8fP8eP55FIIdnTSinubFKVjxWvt1p5ijsL5ZLd6JaU88vIaH0ZARhzBk/XYIblk2E9MsT1ANeGpX7sQKic7Q4vdi2DF5SN5EkzuXVU119+v4hV+NJpaMATSTqpePqdO+WFsDVtF2KWXTBp+0+sI8rUyd41ie+qvwr+MbrfCa1Vkh4Ewm0a3SUWv41a4Fs8+/iZQ/oQ9ogJNEzgYREmYPED9J/DJrtCeR2Ef+7rBJWz3KFy0yyozD0IL8yoSHrw6BLb5Ue9jrlXMlnHLk1AiTi2E7hlkxhw/X6u+Zu/6fnQWB4yn3qA7zEi/hRkgL5Uo2HTaK8uXd4RKCTdUBPsZbaKpwns0Dtoh35sx6nuFmMC98ARkOk7ECr0iF+CpiEPvYSb6FJWmJB9JMBJ5ey37p1nhzqcVqJqTzmbBIFRy8A7fAHMjlkLjksnWOyzkOST90QAWof4nij5ckmyQC4ZQF1bNo3+Qk3QWunUFSV/J3oH1ZiA9aqrnFn+2hKbyNlmkmljYNbEwXAVwZ2W+Pe9B8DaCc7gu3YKLIkLgciM3RCbc4BJrTbSSEMXtO4lfSXJpmFM9HNS71kX0yHmxD5YGrcRfooLhV4LfNmABvGyiRYjeA3iU5BHL7Vr5yV+iMSPt1WIe9u8EcTnpY9byyVfCr2km/GDlOm0m6uk0Ga8K5s8Yglc0HvKaFjn78Kk/oa3I0SOl8KgoNE1upVdVwfB0fOH2AoWWmRNu3hKy/IRtZ+BKASWtN8g/Ggkup6RMCZ4JvRbPK569K01iK4T3vUfxpZ08mv6SINStNVWJf7eJsgK6d1XAQxFCqk9+qvLkfC3tBlETbcKpwGHqPI6TjefCQYhE8ycOATmojYYMKXu0XZuG2aA50ZNIGbI6imoxtcxZvh2tqp605mxkzjMA3ujq5E+X/KREcpQg4baKqX/JWGyeZOvVt7i5qjGgvAU82sJRGwGkYztuO00bYzFvIQ34bDQLpVyqV10s3r4fJDw19HVmy9UcrY2v5RL6DvkQ1RlI0Vy7gR+yGd8k0DcT9PI2geO/lUQv8MUjdTbK6T69v45ass8WzmnsvWRfmLzS7s+duvze/JhhQpxJIEb/jg6ZvuqsIGlAGJjO1S924YGN6pkOlJfJQhPUBD2CZRc/+YKlz/b/GIvqi2UiwVkElAbXNVfUMFCyN4yBopMmVTeOAk/BtpOGq5B+HJ9W4+fXy65gS7eHKEX52CVWr7GeDVXiD8QqiV9ESTu0V9SwTqR5ZoZhe3wwXV4QxmB0D3V7Tl4o51XMn9ed3Czl6QCwXCiUC0d1MpP/DebX92F3G6r5loKlFJvOzlXoPdwmFlgSRBUmdSDQOHRNwEoUmkcVe2wwg2SeC8x1Phscu6aQCWZTNqQJrPZ/JovsnmtvAZ2sFNyi1Ed3q7xsEhlyjXNKA6+LkwrNDac0HGKOyuEcfB1ZU0amhh+rYR/IFRx64QK6VfoHb1r03S9jBlQbYGtfFAXGliND/BubYyglSaqiaM4AqlYkrhXrRno71FxJo1jd9D68aSxtAzrpa/uxQ+R+BGt5ZIeX4yT/r2xZfIaVRi5laf4b9SEIlJxq9BGltZ8mFUP2VMjZcIqvODg54oEGcFMRUcLM4Q2Q0cEJ0+FATpF1f141kV0CnhJyvBzhCFD9/jcvc8/fjUgzxKM0MLL8T2hl5ODSCULREY4QR2vtT1kvnagr5RzIKYg7EBaggjWDr0KirVTgQppjA5T3ZgZ0R72PSQwRSZp5TrlK9oSoWncutqZqXT2Nzzrk/LqmXwVeHLRp58j8BJ3Ero7fti4M3iN+2qGGuGPVPJsq5D2Fqqka5C4RahOK+skwOs4eD9UGymk8K2ac6LevC9G9PvTGx/GbWxeAzGDUOHyT5EX10eg4n4SKqXZaH8fvQ6iIxM+Rjf2DN7DSsQtji29nD6l+2uS9leFFYLEv/3As8sfBWNlLQTeUmc7FbcYCXFIpOlaqrAwwStQun8WqiSp+HeWC71lQ0XeA1vTHCU2hKHBKdxNl9W9CKZukRBUrt7Sz/kzka9Ld9FYqTtih3l2NPpWJY1BVzMdbXouumqX7ZWyK9rD/q+SnbVTSjMQO+zF3w9HCV8gHCvzFPoN/qGFj+vnH4hRuonQGrXehOKbrqar6Wq6mq43+fr//vinddM/CIoAAAAASUVORK5CYII=</icon>
   </dashboard-extension>
diff --git a/Tutorial/Manifests/Tutorial_Part_4.trex b/Tutorial/Dashboard/Manifests/Tutorial_Part_4.trex
similarity index 98%
rename from Tutorial/Manifests/Tutorial_Part_4.trex
rename to Tutorial/Dashboard/Manifests/Tutorial_Part_4.trex
index 529bbb87..cf1147bb 100644
--- a/Tutorial/Manifests/Tutorial_Part_4.trex
+++ b/Tutorial/Dashboard/Manifests/Tutorial_Part_4.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Demonstrates getting the selected marks and responding to user input</description>
-    <author name="projectfrelard" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Tutorial/Part_4/MarksSelection.html</url>
+      <url>http://localhost:8765/Tutorial/Dashboard/Part_4/MarksSelection.html</url>
     </source-location>
     <icon>iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAq9UlEQVR42u19B1hUZ/Y3Mdn9f1u/3dTN7ubL7n9NYmFmAPvGJJoYjV3QmTsDih0p00BQLIAl9m7sDQQRG6hgAZFmQUBUQEERQbEgahQLdvB857zD4J2hTVVMuM/zPigww5172u90G5umq+lqupqupqvparqarjf3estGLP7tf3yHfChSSO1FCs5JqJL5idSy9XZqWZKdQnLeTs7dxHPXzosrF3lJnuC/dY5ITt+TPMSv9/D8jP++JFJymXYqWZSdymWuQMm5CZXS70Q+3OfNFS5/tunS5R32d5uu13SJxW+3QqJ/4Nnlj628B7YW+nCuQpVkuUghSbdTcHeQyJV2XhKw1KH3q2KOEwIVt0roLR3ZYryL4P1x/f7UKkj8W7qfJqJY+wrq8o7Qd8gfhAqnf7ZScv0FCm6VnZLLtSPptSCxDT/cU9QS5wRK6XpkCnFLL6dPW3mK/2jj1uY3TcSyoHoXDunOiG7rw/VBFb9OqJAUi+Rc5esheh2H7kfOXUPzs0mocBlUzQxBNs2aSGjKhTa2hZfje595iu2EKulEfLAnUNKf162ixUgEPEop2KudoY3vEGjnPwzaB4yEjoGjoONUNzxjoOM0d+jEjofecdf8DH+n0xT8vaDR+NrR0G7SCGgzzhXajB0MiCcA8QSZAxB5iutkBns5V4FmKBcZdUYrhbh9c4X4A9JeTUQ1kPAt3Zw+bq2UdEX1uholvbRWgjMCiDXEkHMaovsNgbaThkOHKW6MoP+d7mGxQ+9H79t2soYhHJAZEA+we7DzrJshCFAiAwfbeom//0Le7+9V4LHpqk3Vt1QP/thWJf6e1Cg+uAe1EZ1JOv1fyYGDbxXBgyxPcEMOaZT2k0eitnEFO5VUw4x1a4eHyNARreWSHl/IpX9vMg28S+Dv/NfWasmXSNS1+ADLa5V2lDa0/0h0F6aWO6KaftUEr5cZkAE1zDAERCpOc79edTGCBEGj5Gsycb9uyiNaFnnLWgvV0gmoxq/WKvGo3tGfh7bjhqJddmtURK+TGaaMhrbjh73EDLVoBNRy14VySZCtSiZkbuSv7RK6O35oq5Q6ChVcPD6QCn1Ax+y6jzO0nTCMqdo3gfA1GWEMtJ04nMcINWMLqPVSbOVSjszfr8SXD2rWUsnZihTiqagmS/gBG62qJ0DXDh9cx2lvJuFrmgcNI9irXRhw5GsE/PcLdB9vCZTcnFbuA+1/0SDxY7c+v7dVcN1R6iMRPT/CB/CCJw1gj0Cq7XjXXwzha4JGd2jjP1SjEeQ1zN0ToZzb10ou7tdc0fPPv0yVr5CMQNV+Aon9TEfqFYjo0YXr8IbYePNNgxt+XlewR09GFx+InyMuyLNVShQU+PrFEN/Wj/sPgp5A/HDFOiqfvhLAmzAc3bgxr8WVe51eA5k5O29nHW1QlXO4jlpyrhBN5Rvv2zsgykXi/4Qf6qaIr/LJ1o8dDO0DRkHH6b8ewusHl9oHjWbxDNKCPJPwAp/VHRSYEKGHpCM+xzcwZhBk00zgJe4kUkjC8APd0VH5So2try9i12vBWAiKXA5hR3bA7hN7YUdGNPx0IBRGrf8RusxUNFqi9lvoBxO3L4GQQ9tgZ2YMRB2PgRUHw/B7S8FlZSB89aNnDSYgk9DGf1hVMEnM1wb3ESDuFHoN+u7NCiUT8VWSrxHUROIHuqdDfJUzU/l1uXZfTvcE6YoAiMuJh+JbZ+Dh42KAyutQ8fwa/HyvALIupUPo4e0wdM3URkX4LrMU4BuxEPZmxUJhaQ6UP7oElRUlUFFxDe48KISiGzmQWZgK65O2QLc5ypraYKrWU3DWmEbt8ZSUi7y4OIFS0uvNyDIi8Vsrnbqi5O/GD/KA79vbo71rN2kks391Pcje88dCbFYcPHt2lRFe/7yoLIF75UVw9Pwh8Nm8oFEQ/4f5PrA0biPkl5yCJ08v13rf2nMg5wD0mOdTu0lAL4GSVw5oGkW6gaNH+P/E1p6Svo2bCZD4LRTib/Bmo2sQ38eFfbj6gB5J//C101B6iut9iHSeIoOcuXIcxm9dXEOtvsrTB1X+mqTNUHrnLJP4hu675PZZUITNZZ+1zqRT0CgNLvDieG6i5DEKVaKtQtq7scYK3hKoZZ0Q3EXpEF+OLp4Pgr3AUdCpAbDXZaYcZsasafAhas9zNAv5104y+/rVDK9XT/wFfrAuKQJu3j3PNJOh97375D40Gcq6wSGeDgQO0TUW8eMFcskjNKsHBArnbjZim8ZVgdSK8vZySTja+ft8ySdOJo42xMXrNkcNURl72EOqROI+fngJT/3agLDBRbSvs2JWs9e/UuInR8Cte/UT//nTK/Co/CL7+qJKQxiitTSaYDRLcYvkeskkBRdNyTObxlKT2Mpb3FyoEK/AmyvTUfvk5hlIfIb80ZaeuXwcnjy6DCdPHIWdUVGwa9dOSDgYC/lnj8PDBxdrZwIEWjfKzsG2tF0gWT7R6sSXrQxAdL8H7ty/UCvxK5+XwPVruXAsNQliYnbDzshI2L8vBm7fymdMMGP3KuhsgNliHkKVJtCLFTyglPkXqoHC1078f6tkHwkU4qnk5+tIPhK/Q+Aoo4I7Tkv94e6DC/jw8iAsNBzWbwiFDRvCICQkDMLDI2Dfvj1wqSiLaYfawOGDxxch5WwSuAXPQJNgOVwwYPF4mBW9Ghbs2wCbU6Mg90omwym1Ef/unUJIPZoE27Zth40bw9n9b1gfyk5yUhxjbo+QGYgBjChEYbECXWCIz7tMpJAubDnW+dPXRvyPfLv/QaAYNEYoF1/RBnko48UAX+DoBm2+/nFGybpZlg/37xZBcnI8rF+vYQD6qv33tm3b4MzptDqZ4Amq2utlZ2F9yhZwD54JXhtnw0b0ySmm0HWWJn5AsQRu+eRa76H7XG9Uz146ZmnB3vVM2u+VF6JbegnNTu0q/8b1s3Agbh8jvPaetfcdEbEVLhaegopn12Du3nVGAVeGCVCY9LwDChbdsJVLfAUezn99DaVbNu8QIkVQkq0N7zK1r5ZBu8kjWZ2dcZLmDtLlk5gb9aj8EpMi7cPTHu0DpYeZl5tRp90lRqD4AfnfdxjRihnxzl7NhAulWXD7fgE7ZDb0z827+XDtdh5kXUyH9IKjcB5du/sPLzYI8spuFzBTRdpqwwa9+8b/b0SNdrP0LDMBd/Bvd5+rNr4kDYWKXGlt/oAyiShwF2zlYo76Il4p/VvLOZFAzsXY8RI7LMJHadypxod2CcVPiVrOHjQ9pPt3C+HIoYN1MsHOnVFQfDHbYORN70tYgU5DxGS/ixqGnYprDXsjqHXSjiVBcHAYrFu3sdZ7vlKcg9J/lX02ev++i3xNCB17MOGyU0v5SaQKoUKS3MprYIdXifj/JlRKZ6LkP+a7e23HD2URLVPsbLfZSjiUl1j9UB+iFjh6JLGGKq1mApQq+vmj8mKDmcBaJ/dMBkRs3sqIrz38+96xIxJu3jjHwKH2Nf0W+ZmcRKIiGZFSJ0bwVKCQLLP1kX5ifer37Pk/tiopZ6cH+gjxd5hqejqXAiNkm18i6WtQgkh6164oRuiMtJQakrVpU0S9puBVHDJXh1LidQhODBAXuw9OnTyCnkwknDh+mLmzL3iBou9mq8wqRnUYp+seojDeFSgHDbfx7vQ766r+MZxIqOQOsUqWqvi+vUrGkKq56dye83zgFNpeelBldwpQrSYzyblReo55ALWp1vS0ZHj25PJrlP50xoj690bmICf7GJTfL4LTOWlorrLQVLwMb387W2lmFtEN7BBs8/EAmoLM1p5cO6sR/x9eju8JVNxUnb47hbQqn29+SrfX/LGQceGoxk5SIgUR85XLp2H79h11YoEjhxPqjA+8ipOddawa9fPvj93julDGxGTO+IEgOj3n+5iXSp5OeGAE2OPz59cSoHDO+Y+744eWp75Y/La9UvqdvZy7pRvpczUJ9NWWTQuIXKYLxvCB3SsrhJSUg9UxAT4DhIRsQilLe60m4Erxadi9e1cNnKLVApd54I//uqFrpphfT4Cek74pQNNchuC8p8XzBVSihMAvVCe1q7aM6ie/e9quVTXROD60B/eKIDU1CUJDN1cFVbTED2OBFXK/XjsIRBxCrikxKZ9RD8bvhxvX85gmq5EPyNwL38yUm80EVFNBdOCXlgkV3DbqTbSg9Lf6LXXjosQ/4dW1MzRqiUhb97k+zEev7eE+e3IFck+n6wSFSLLi8eHeupn/2onPQtFI4OxTR2Hz5ggdJti3Lwbu/Hy+hvRrD2U+LfH82qEJttM1BU8pNtAcAbtF6P8fz/6faCp5edLvLas3r2+UCzhHBXtO7q/j4V6FgvwTjOha4sfG7oXS62cbBfFfxgKuwonMIyxkrQ0EEZPeLbtQJwNocgKWqTbmA8Iqtzy2hXrAv8ynfps2v6FqFCpKeAn8OBbwsQTxSQ0GRa2AZ8+u1PqQKHael5vOVCwRf+/eGAYMGxPxtecx3mt6ejJsQiYIDQuHyB07qqN/tbqQT4pZuPq/FqiJZAEi3brCZyJ015v3bG6eFiBEKVBwYdX2xWsQK1uyhPRTRozKqB4/qT2YQ7GAOz8XQOrRRAgL28yIT6CqMRK/mgnQ309LS0LXcDNER++Ci4VZzIzVxQQFpVnQY563BQChR1WugKcFFNIYkbv4H+bQvxn6lh1RnZRZQ/r7Lx4PN8ry6yY+ArzDKfEM7e/fvwcuN1LJry04lJ6WgphgC+xAF/ZSUXYNN5Cfyh67eb5lsABqARFPC4i8uMdCpfgHmyAb0zwCmr8jUMlmvXzDQSzZY4nOXJL+hbHBtcfiq3IBJPkUZElMjIPSkrw3gvjVJWuPr0BWVipERUXB3j3R7P5ry2BSGVlyXiL0NTE0rB8gYskivhZQchv+pR7wF9NcP7n43zQDh9/I0dbfMsh/2NopcP9hUZ3SX1qiSa2ePHGExQLeJOLzvQOS/uSkeBayJlNQq6eDQJfK37+fa35FU7uJI/RDxDdoiJbx1UMI/oRKZykbd6Jt1UZXo4NFpN8DYnNi6yyiJA1A4I9iAG8i4WvTBsTEtcUD+IBw3r4NOrUIpuYJavQXeHNyo8Hg+yP6/UmolG7Xr/KxhPSLl01kdfPGFFL+0g8Jw4Xr2fDdbPO1gIP/UN3qIaX04P/z6G1c0UhL5cDPEFDc5LdytZ80wgJunwLCjkbC8+dXmwivxwDX75wDv4hF5kcHg0az9DyPdg9aqcV2hpsBsc3bArV0mF11mRe1c8ksMqhBHjoH7jy40CT9dVQ4n758HNxDZlocDKIr72NwfoAmcApVsnB+5I8mY5lLfEqBJuclNUl/fXgB3cXks0nguNTfrGdNxTl8BhAquNh/ig2sFfint/hdfEEx3/63mzzKbAagki+qr2sidP2HnhH1HNTVPWSQGQgcBUL9cXWjDJs50Iw6fLRzezToX2K2+h+xbjqqtwym5pqI3DAeyCnOMKtohCK1IpVUp+Vc4OPcy7BSb6XUW7+vz5yU7/A10yA5N5GVbDcR2LBz424+TN21wjxvgHoJeAkiWyX3Y4OzBljwRyHZyp9f0wbtiak34bhkPMSdjofHr7Fs6008hJMyC4+BbGWg6ThgwnAdd1Ao5w42ONVcpBR3Rhciv3rurVJqlv2nVmgq82oCfsYfaoMPObzdZCxAzTlC3RTxdRu3Nr+vXwN4y4YiYHhYzQCo/qnqxORqnxmekFZwmHXyNhHVeCxAAzHEyyaY7A4KFTpDKp//r3LgZ/UygJ23bC5/lg+5f53MsEPqTfOg+OZp/DBNBDUlLpBZdIy1zJn6/NlIOr4Z8JX1rZ8BlNI9/Be0MyP1S/1vCbkJ8PTZ6wF/VC5+7copOJl5AM7mHoKnjy+bGMsvhktFx+EEvs/Fwgwov19YZ37f0hqAxsr0NqOCWDNogscAaqlv/Qyg4HL4L+gQMNoMJOoO+7NjGxybYrEHhhJThATasnk1+Hi7Q4/uXaFtGxHYtm4BImFr/J4H3L1z3qj3fPigCLZtXVv9Pg72Aviua2cY4+YK69YsgLwzKYxBrPWZSsvOwayYtWYAwWG6DKDgljfEANf4L+hohv2nrF8Sun9Pn70aAEiSmZwYBdOmjIPevbrBP//xd3jn7XfgLZu32Pni88+gtMS4iqKfb+bB1Cl+1e/R7K1m8MH778G3Xb4EP18v2BkVwt7TWhqBzEBq/iHmTZkEBCeN0J1IquSi6/cCFC+HPDAGMLHmn4i/KDaYddy+qrg/FZDev1vACHKxKAPO5h2G9GP7IHpXCGwKXQ6nTsQb3UVElTwXzqfB9q2rIWrHejhyOJpJfdGFdCi5moUaJZ+ZFmuahOziDJCumGyyJ6AzqVwlS6+fAXgegIYBTI8ALj8YxvrqX29RxlV48qiYjWmhfLwphKL3oHE19D61NXlYFcfg34s/cxC+nmFaDwFpcB0GUHJFDTGAzgYucyKA8/euh1t3zzcherOA4DVIO38YeppYOMpKxnVrA0rrxwBy7pkOA5jR9rU+OQLulhc2EdKMQ9rm2s95MDN6jWmxAD0GoNH09TOA3vIG4yd9vDykup49a4r/mw8ES9jk1M4mzEOkpJD+Eqv6TYDexk1TTQA1e1Isu6nwwwJaAJ/h4XMpRo+V0UYD9baU3H4lDDBt10o2FfNNULH6pzEywLGCw9Bv0TjTooG6JuCOkQxgWq/fpiM70P433qpeChoRqr91IxfduiNw7Uo23CzNZS4dlW/X183zqs/V27nw4+6VJvURGq0BKGFgrgag7BV5ABQDaKzEP3UyEfzG+sA43/GwaMFiWLZ0OaxdvRbWr10HYRtDYGvEBrh6OatRMAFVUG9JjYKvZnhYHwPgLz01lwEcl/jDgdMHG2UNABH0YuFxcBowEFYsWwFpqWlwPP04ZGZkspORlgHJicn4s5Xgo1bCnZ/PGREvuMZ6AJ4/vWZxxkm/cNSkaKDxXoB+IMiEBU4UtKDyb0pkWKvjhpow6dTXbFGX9Ht5jIHu3XqAs9QFpX0T7NuzH+Lj4tmJ3hUDs2fOht49+8JAx4GwOXyNQcSk9716OQcy0lOgsOBkjaFQ5hWHXIO0giMweFWg+RrAgDjAXUtEAnsv9IXsS+lWkWBquT58OAGSEuOg4PxxFuUzJrTb4/vu8N5f34P33n0POv/3a+jXZwASWwzigRIkfB8QCezg3b+8C59+8in4+ihr7emrUcJVmgfbtkXAihVrITh4ExRdOGXQ6ww5JXfOwtqkCJPGytSMBEobiAQquOuWSAYNWjqBDX62xiCGUyePslFsP06fDRPGo7mJ3cESQYYywIfvv1+d3Pk///M76NOrH2OCvr37w7ddurGED/3snWbv4Pd6NEhICg9v3xoC4/38Ycni5WyQxdncDJ2pYOacy7fOwNSdK5hrbXwuYJR+LiCtoWxgvk46ONC0dDANbC64nmWVPjuaxLF2bQgEBk6DwS5DYYzbGIjbv53F6w1hgE8/+QQJ3Iydv/zfv+gwQLdvv4c//O4P0Ax/9vvf/Q6GDuF0BjzWSqBLJ2DalMng4zOOaQBigPxzmRZjAAKBm49Gmj44gm8CVNLdDRWEJPNf0H7SSNPiAFEr2cxda2kAYgDSAkuWLEcG8ETpGwvZp5KYNDZkqzmxGD7+29/xfAxdvu7KCK9lgF4/9IE29m3hbx9+DG0d2qA3sK6BWQAXYWPwCnAd7ApTp8xg90UzAUqu5loMA1BhSOKZBJMSQtTNrbuzWLqsgaJQ6Xr+C0xtB6d257rav8114c7nZ7K5AcQA9MAnTghE+y2FxQvnMH++vgdPP9sVFQaDnAYygmuJrz3a79HxUSuQkDn13EsJnDiegDjBG1TKsbB8+RoID9/C1D9pKksGgo6wSKC32RVBIpVkbP0MgL/AX+lKHcGdTEwF00Ruq1TLlhWynnstAyxGuzt6lAdD7RHha/Hn5xtgohJYunguSu0QJHp/dviE7993AIweOQLfa129GqW05DQsWjALhroOh5kz5jLwR1POabiFJd1Acqf3Z8VB34V+5tcEqhuoCRSpuD58V5DmAXUwwROwlhdQrQXQxm7Zso0xwerVG0CNEti/ryOMHD4cEuJ3sjEt9dcLXoGoHaHMdvuN9a4+/uN8Yc6sabB/71Z48uhSvdVHO7aFMNU/zncCrFkdDPv2xrCdAZaOAdBKnMDI5WyXorlVwf/xFjdvcAw8vy+ARsC3CxhpUjDotBW8gJcEuMhGyNDkMNIC06bOBGfZEJTgfogHfCDrZGKD1T9EqNu3zqLKPsLCwXQKCzKYBqmPiMQ86cdiWaDIdfAwmDVzHmzdug0uoP9vbFzCkEN9FT3nj0UM4GVWXwC6+CUN9gV8Plb2vkgh2cKfC2BKZxAFLc5ePWnViN5lGtO6SzOmldA3gUGtGp8+NYAxwRMDVtCxiSS3zsFzA3IXBEKJUaYGTQLH/gNRa/jDmjUbIDU1kTGlNT5resERll8xGgBO1OsMUnAHGuwMsnFz+43Qm1PxW8PtvY3vDaQ1qZmF1u0IevbkKlsuFboxnGkBP1TFTgMGMbeOmGCi/zjYGRkGOVnJUH4nH17o+fNE+Ec3cqE0cRecnTMNLqxcCKUJUfCgMAOeIbrX1wJUIZyZEQ/TpwXAgH6OMMx1BMyZvYAtr6CFENbKG6SeP2zSWFkHP93eQIFaOs2QIRHNhD6SjuZ2BxPHbkjZAmUPLlhVC5DNJdtLWGDBgqWMKMQA2sOJpTDORw1pc6dDMbp0Nw5Gwc3k3VAaHwkXw9fA6emT4ciggRBv1xbi27SHI44DINtPDdnL5sH+3eGQeHAnJCfuhjM5hxB3pEFQwETohyCRSb8f2v41wSz8a4imMTUMHH/6oPndwXKuUjDWpafB8wHQX7xk7nyAEWuns3WqlVbMqBFKz85KZe4XMcEE/wB08TgdJhj8fS/Y3qYDJH3TBVKdnOCYRAxHHR0hofPXcIAIr3fi8AR37AyDxRyMGDYcbb0K9u3ZCqlH9oOL82CmXUYMHw3z5y1mq+2KL1lP+h88uggRqZEmjonRTQI1Vxg2H4BNCBEpZZt0JoT4uZqUFKKt37Rpy5oZvtu3zrP5wYQFflq6EkaNGMOIpGGAvjD9y28gxr5dDULXdXY5tAfvLt2gb5Up8UUNQtJPTECexkAnCYwfP4lJPwFRa66toarq1QnhRj/7NvoTQuSS/QZPCKEZQUKVzFVnRhCqE1MSQysSNqEZsG5hKCHvzOOH2Uh50gLkEcg4F02Qp2dfCGnXiUm1IcSn39uAvz+gZ5/qINGUwElw60YebAxexb5HDLZo4U9sT9C5vOMNhorNOVRVTf0Vxi6XstOfEaSSqY3aIcCmhPGXQ6A6MdYdpE1g8TkH4KmVW8M0WCAP9uyJZlpg1ar14OWhRKDmBF5du8MOVP+GSv9ulH5lV430E/FlnDOEbFiJrmIqagIfNC8SmDB+MgOdBw/GWnVfAZnO89dPsQZbY90/86aE1TUn0G+IkUBQDfuzYuscBm3pHMHhQwerx8rPm7sIBksHwzK05fuNkP7gtp2gP2oNrfQr5XLIP5vGQr6ug4ei9LuxyKNmX1GKxRI+tfYlPi6G6BP7jC4GdUD1L9SN/ycYPSdQMyZe6qw7KZQzKj1MGoA2e9Nq9VdR6VNUmAVRkVFsVj9J6AqlJ0T/t7PB0h+NOMHr2+46ySGKDNJOooy0A+hhDEfXMoCZGVoNez7/hFVLxmgr+dw960ybFOo56CUDqGUKk8bGCzyc/lfESw9TUKGdkVtCpu7UVAe/ivkAFP6lJQ20sSN4bTDk+rvB1cE94HCHhk0AeQOb0VT040k/ncDJ/iyxk5wYDW6j3GEpgkyS/sSEOKvPML504zR4bpxj/Kxg3RrAGy2VjrYmbRp/f8SXf0JfcjZ/WjglF4wBgx4hM8Fn80I4d+1knTt3LZkjOHYsCTZu3ASH5k6B+35SeK7oCyWybpDSvn29DLAXpZ/Zfh7xpRIZbFi3DEquZsOypQvAz9e/eikkJX2srf5jsw6AzIimUEra0UQXPfQfYrz65wWFWniJO9FSQv6+AGOGRnSZpWQDkHdn7rF6kSipYxrLnrQ1DC5PGgUV6gHwQt0fnsn7QG7PryDBoW7p34kMwJB/n5fq323UKDieHg9ZJ5NApVTDokXLGPFpeUXWqVSrqv+rP+eCatNcxFGGj4ojkG6nsy9A8lTgNbCXyfsCtBtDhEpJKH9jCLkYxm4MicqIYUENa3cKPbt2Cu6h1Dz1dmLEp1Op6gfl7r3gUB2mIBZPwNffskQSnwG8VVQVnI9McADGjPZkWUdigD0x0WyrqTU/R2FpjlGzgZj0jx2iK/1K6T6hocGfunMDNDZe+oOdF1fO3xNs7OgYamyYs3eNVYpEqk3A3XNQuXkOVPqJq4nPZ4K7I3+As72/hgR7XQbYh9I/kGx/n/46hSFDh7hC1I5NELd/B7i7eVWr/+SkAwaVn5kzHWxN4majagApUkuZW97+wOdCtUzWXGGBzWGfu4v/IVBIX2YIPcRVWMBwLfDtbAWrarXWvIAXjy9BZdRSqBwnqUF8PhM89eoDZSN+gGNfdtCx/9qwMd8DoFz/2tVLYcmiuTBxQoDOttIKK049oSJQJyN6AEgb2/sM1tsdKDnwGYJ4y+wN7NLlnZYKcW+0KeV8LNDGf6jRNQJx2fEW7xh+gcSoPBAMlZNc6iS+PiM89ugNaZ07Mvu/xaE9C/zw8wfEBGNGu8Gm0NWglKuq7T+tiT2eccgq9p+GQRTdyIGC66fYNnVj0r5W3RvIIoNuTh8L5NxqvRJj6Gjk5lBaFHXPgj2DrKEzLwEqF6qh0gDi62sDYoCJX3WtriPgM4GLbDAEBUwGlUJdbf81yZ9s6+Q07hfA4JWB0NuIyp8OtESawr56m0NbuFtiZyD/CrJpJlCIv0HJL9HdHTzE6FqBVQnh1VrgzgPzQqmVDy5A5Zb58MJ7gMHE5zPB+QFdq+P+fCYY7OwKO7ZFsq4h9zGeVfZ/IyQkxDZYbmbqmPiIY7uM3h3chu0O5qy/O5iliUf2eFcglwbodBAraY3cMKOYgH633yI/GLFuKniEzDZL+isTN0HlBJnRxNeeJ8gE4/z8YeWKVRC2MQw2Bm+EwMlBcOZ0HuSezmXBHyr41Nr/FASAlrb/5BlR0qfnfG+jUH+7SbQ9nNPdHi6XzPv3qH4fWW2FfAu5WCBSSJNoX311xRCagvYmLpEeuX6aSa4hI34Zov6IeSYTv1LVHyrCl0DF8wqofF7JvrLzrAIuFV1iqn/48NFM/ZMG2LJlK9v+ZemED8VHKGRujACR6nfwean6iR5I/BOtPbl2Nla9xK1+a6uUSFDV3KxOF1eZAlNmClOggzqInhkpVYwBjmyDyslDTGaACmSAW5dogtgjdsoflMOV4iuwbcs2Vlk0FI828UMMQGvsLKn+ifEpTxJ6eDubqmpMvx+tjbeT64R8UfUPGm7Tp4GiT0tctqp+H6GbMQNvgLdPWMLWlJgyVIpWp25B+0dMYOhY2RePi6EyeoXJxKfzWO3E6gaGDx3BVD1V+HISZxb0CQr6sQr4hVVtLg+FQykHLdbwSaVeFO0b9NMko2b/kOtN0z9FSp7q95Q8FaqkS2w9+39i86ouVj6u4KLtvMTPea3HLEBkiimg8Se0VILSxw8NCBm/+PkMVIbPNl3940mdpanqoQQPHersWV8V7NGuq9eurKcNoJcvWW5vMY1+c1kRYHShB7Xq0fZWHuqvQNCX1Eo1sIPNK73ENm+j79kbVU+OFhSyMCTeXPvJI02eLjZgyTgIO7qDJUPqZYDzKfBiiY/JDPBUPQCC1wVXE7muo2WG+AP769z8aQjCJ4mnPcEUDifAJ/5povHEDxyl2QbGs/uohQvI5yfTbPOqr4+GdP+DQMGNQSa4oh0xL6wqI28fMMrkAVPkB29P340qMq/O/AH5/i/mK02W/oJAD9iA0m4IA1DyJzPjsNHBH2JimvVL0z0Kb2RD7pXjsD4pgnk+xiyB0II+Fu3TnfdzQ6iU+go8nP9q87ouW5XsI2SCqSj9t14mjGjLqAt0MIMJaNHEkFVBsOnoTnx4OSxIQoygrTB+UZQKL1b4m2b7vZ1g0+o1sIGn5usiPlUYUekXFYUYQvQnVdJOyD42Ow5yLmeAPHQ2TN+1CgYsHm/SkKcOgW6sKJdPfDx3hXJucQu19F82r/vS1A9KVtrx0sZUQ8g8A1Rb5iycoM1Z1GSyKDYEzpWchCu3clmV8fO7+fBi2yLjpd/HEc7P9IHQDRt1VLz+Ccaf0fr3uNi9cO3qGYOkn1R9JjImLcg4kp/CNqW5rAyAriYMdngp+aM1xJfr+PsP7JSS8NY+jiKbxnK1VDs5COXiCLy5+7z99ayOsAOLEZi3c5AyY1IETZN3LIOdx2MgC9Xq7cil8MLHyXAGmCCFirUBcOJwPKQkH4D9+/fC3r0xEBO9G6J372ZtZnRiYnYzm5+TnQb3yhpOXlHV872HRWy9S0DkT7AqYROMXDfNrL1/WrXfBp8fP8eP55FIIdnTSinubFKVjxWvt1p5ijsL5ZLd6JaU88vIaH0ZARhzBk/XYIblk2E9MsT1ANeGpX7sQKic7Q4vdi2DF5SN5EkzuXVU119+v4hV+NJpaMATSTqpePqdO+WFsDVtF2KWXTBp+0+sI8rUyd41ie+qvwr+MbrfCa1Vkh4Ewm0a3SUWv41a4Fs8+/iZQ/oQ9ogJNEzgYREmYPED9J/DJrtCeR2Ef+7rBJWz3KFy0yyozD0IL8yoSHrw6BLb5Ue9jrlXMlnHLk1AiTi2E7hlkxhw/X6u+Zu/6fnQWB4yn3qA7zEi/hRkgL5Uo2HTaK8uXd4RKCTdUBPsZbaKpwns0Dtoh35sx6nuFmMC98ARkOk7ECr0iF+CpiEPvYSb6FJWmJB9JMBJ5ey37p1nhzqcVqJqTzmbBIFRy8A7fAHMjlkLjksnWOyzkOST90QAWof4nij5ckmyQC4ZQF1bNo3+Qk3QWunUFSV/J3oH1ZiA9aqrnFn+2hKbyNlmkmljYNbEwXAVwZ2W+Pe9B8DaCc7gu3YKLIkLgciM3RCbc4BJrTbSSEMXtO4lfSXJpmFM9HNS71kX0yHmxD5YGrcRfooLhV4LfNmABvGyiRYjeA3iU5BHL7Vr5yV+iMSPt1WIe9u8EcTnpY9byyVfCr2km/GDlOm0m6uk0Ga8K5s8Yglc0HvKaFjn78Kk/oa3I0SOl8KgoNE1upVdVwfB0fOH2AoWWmRNu3hKy/IRtZ+BKASWtN8g/Ggkup6RMCZ4JvRbPK569K01iK4T3vUfxpZ08mv6SINStNVWJf7eJsgK6d1XAQxFCqk9+qvLkfC3tBlETbcKpwGHqPI6TjefCQYhE8ycOATmojYYMKXu0XZuG2aA50ZNIGbI6imoxtcxZvh2tqp605mxkzjMA3ujq5E+X/KREcpQg4baKqX/JWGyeZOvVt7i5qjGgvAU82sJRGwGkYztuO00bYzFvIQ34bDQLpVyqV10s3r4fJDw19HVmy9UcrY2v5RL6DvkQ1RlI0Vy7gR+yGd8k0DcT9PI2geO/lUQv8MUjdTbK6T69v45ass8WzmnsvWRfmLzS7s+duvze/JhhQpxJIEb/jg6ZvuqsIGlAGJjO1S924YGN6pkOlJfJQhPUBD2CZRc/+YKlz/b/GIvqi2UiwVkElAbXNVfUMFCyN4yBopMmVTeOAk/BtpOGq5B+HJ9W4+fXy65gS7eHKEX52CVWr7GeDVXiD8QqiV9ESTu0V9SwTqR5ZoZhe3wwXV4QxmB0D3V7Tl4o51XMn9ed3Czl6QCwXCiUC0d1MpP/DebX92F3G6r5loKlFJvOzlXoPdwmFlgSRBUmdSDQOHRNwEoUmkcVe2wwg2SeC8x1Phscu6aQCWZTNqQJrPZ/JovsnmtvAZ2sFNyi1Ed3q7xsEhlyjXNKA6+LkwrNDac0HGKOyuEcfB1ZU0amhh+rYR/IFRx64QK6VfoHb1r03S9jBlQbYGtfFAXGliND/BubYyglSaqiaM4AqlYkrhXrRno71FxJo1jd9D68aSxtAzrpa/uxQ+R+BGt5ZIeX4yT/r2xZfIaVRi5laf4b9SEIlJxq9BGltZ8mFUP2VMjZcIqvODg54oEGcFMRUcLM4Q2Q0cEJ0+FATpF1f141kV0CnhJyvBzhCFD9/jcvc8/fjUgzxKM0MLL8T2hl5ODSCULREY4QR2vtT1kvnagr5RzIKYg7EBaggjWDr0KirVTgQppjA5T3ZgZ0R72PSQwRSZp5TrlK9oSoWncutqZqXT2Nzzrk/LqmXwVeHLRp58j8BJ3Ero7fti4M3iN+2qGGuGPVPJsq5D2Fqqka5C4RahOK+skwOs4eD9UGymk8K2ac6LevC9G9PvTGx/GbWxeAzGDUOHyT5EX10eg4n4SKqXZaH8fvQ6iIxM+Rjf2DN7DSsQtji29nD6l+2uS9leFFYLEv/3As8sfBWNlLQTeUmc7FbcYCXFIpOlaqrAwwStQun8WqiSp+HeWC71lQ0XeA1vTHCU2hKHBKdxNl9W9CKZukRBUrt7Sz/kzka9Ld9FYqTtih3l2NPpWJY1BVzMdbXouumqX7ZWyK9rD/q+SnbVTSjMQO+zF3w9HCV8gHCvzFPoN/qGFj+vnH4hRuonQGrXehOKbrqar6Wq6mq43+fr//vinddM/CIoAAAAASUVORK5CYII=</icon>
   </dashboard-extension>
diff --git a/Tutorial/Manifests/Tutorial_Part_5.trex b/Tutorial/Dashboard/Manifests/Tutorial_Part_5.trex
similarity index 98%
rename from Tutorial/Manifests/Tutorial_Part_5.trex
rename to Tutorial/Dashboard/Manifests/Tutorial_Part_5.trex
index bddc0ae5..3c04e82a 100644
--- a/Tutorial/Manifests/Tutorial_Part_5.trex
+++ b/Tutorial/Dashboard/Manifests/Tutorial_Part_5.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Demonstrates getting the selected marks and responding to user input</description>
-    <author name="projectfrelard" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Tutorial/Part_5/MarksSelection.html</url>
+      <url>http://localhost:8765/Tutorial/Dashboard/Part_5/MarksSelection.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Tutorial/Manifests/Tutorial_Part_6.trex b/Tutorial/Dashboard/Manifests/Tutorial_Part_6.trex
similarity index 98%
rename from Tutorial/Manifests/Tutorial_Part_6.trex
rename to Tutorial/Dashboard/Manifests/Tutorial_Part_6.trex
index 1648418b..8ed5b954 100644
--- a/Tutorial/Manifests/Tutorial_Part_6.trex
+++ b/Tutorial/Dashboard/Manifests/Tutorial_Part_6.trex
@@ -4,10 +4,10 @@
     <default-locale>en_US</default-locale>
     <name resource-id="name"/>
     <description>Demonstrates getting the selected marks and responding to user input</description>
-    <author name="projectfrelard" email="projectfrelard@tableau.com" organization="tableau" website="https://www.tableau.com"/>
+    <author name="tableau" email="github@tableau.com" organization="tableau" website="https://www.tableau.com"/>
     <min-api-version>0.6</min-api-version>
     <source-location>
-      <url>http://localhost:8765/Tutorial/Part_6/MarksSelection.html</url>
+      <url>http://localhost:8765/Tutorial/Dashboard/Part_6/MarksSelection.html</url>
     </source-location>
     <icon>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</icon>
   </dashboard-extension>
diff --git a/Tutorial/Part_0/MarksSelection.css b/Tutorial/Dashboard/Part_0/MarksSelection.css
similarity index 100%
rename from Tutorial/Part_0/MarksSelection.css
rename to Tutorial/Dashboard/Part_0/MarksSelection.css
diff --git a/Tutorial/Part_0/MarksSelection.html b/Tutorial/Dashboard/Part_0/MarksSelection.html
similarity index 100%
rename from Tutorial/Part_0/MarksSelection.html
rename to Tutorial/Dashboard/Part_0/MarksSelection.html
diff --git a/Tutorial/Part_0/MarksSelection.js b/Tutorial/Dashboard/Part_0/MarksSelection.js
similarity index 100%
rename from Tutorial/Part_0/MarksSelection.js
rename to Tutorial/Dashboard/Part_0/MarksSelection.js
diff --git a/Tutorial/Part_0/readme.md b/Tutorial/Dashboard/Part_0/readme.md
similarity index 92%
rename from Tutorial/Part_0/readme.md
rename to Tutorial/Dashboard/Part_0/readme.md
index 9c87c213..bffcb626 100644
--- a/Tutorial/Part_0/readme.md
+++ b/Tutorial/Dashboard/Part_0/readme.md
@@ -10,7 +10,7 @@ Extensions are simply web pages, so the first thing we'll need to do is make sur
 
 The very first thing you need to do is to provide an extension, or manifest file (`.trex`). If you cloned or downloaded the `.zip` file for this repository, you can find the manifests for the tutorial inside the Manifests folder. The `.trex` file contains basic information like the name of the extension (as it will appear in Tableau) and the url where the extension is hosted. 
 
-To open an extension, start Tableau and open a workbook that has a dashboard, or open a workbook and create a new dashboard. In the dashboard, under **Objects**, select **Extension** and drag it on to the dashboard. In the **Choose an Extension** dialog box, click **My Extensions** and browse to the `\extensions-api\Tutorial\Manifests` folder. Select the `Tutorial_Part_0.trex` file. You should see "Hello Extensions" on your dashboard.
+To open an extension, start Tableau and open a workbook that has a dashboard, or open a workbook and create a new dashboard. In the dashboard, under **Objects**, select **Extension** and drag it on to the dashboard. In the **Choose an Extension** dialog box, click **My Extensions** and browse to the `\extensions-api\Tutorial\Dashboard\Manifests` folder. Select the `Tutorial_Part_0.trex` file. You should see "Hello Extensions" on your dashboard.
 
 ![Part 0 Screenshot](../assets/Part_0.png)
 
diff --git a/Tutorial/Part_1/MarksSelection.css b/Tutorial/Dashboard/Part_1/MarksSelection.css
similarity index 100%
rename from Tutorial/Part_1/MarksSelection.css
rename to Tutorial/Dashboard/Part_1/MarksSelection.css
diff --git a/Tutorial/Part_1/MarksSelection.html b/Tutorial/Dashboard/Part_1/MarksSelection.html
similarity index 100%
rename from Tutorial/Part_1/MarksSelection.html
rename to Tutorial/Dashboard/Part_1/MarksSelection.html
diff --git a/Tutorial/Part_1/MarksSelection.js b/Tutorial/Dashboard/Part_1/MarksSelection.js
similarity index 100%
rename from Tutorial/Part_1/MarksSelection.js
rename to Tutorial/Dashboard/Part_1/MarksSelection.js
diff --git a/Tutorial/Part_1/readme.md b/Tutorial/Dashboard/Part_1/readme.md
similarity index 100%
rename from Tutorial/Part_1/readme.md
rename to Tutorial/Dashboard/Part_1/readme.md
diff --git a/Tutorial/Part_2/MarksSelection.css b/Tutorial/Dashboard/Part_2/MarksSelection.css
similarity index 100%
rename from Tutorial/Part_2/MarksSelection.css
rename to Tutorial/Dashboard/Part_2/MarksSelection.css
diff --git a/Tutorial/Part_2/MarksSelection.html b/Tutorial/Dashboard/Part_2/MarksSelection.html
similarity index 100%
rename from Tutorial/Part_2/MarksSelection.html
rename to Tutorial/Dashboard/Part_2/MarksSelection.html
diff --git a/Tutorial/Part_2/MarksSelection.js b/Tutorial/Dashboard/Part_2/MarksSelection.js
similarity index 100%
rename from Tutorial/Part_2/MarksSelection.js
rename to Tutorial/Dashboard/Part_2/MarksSelection.js
diff --git a/Tutorial/Part_2/readme.md b/Tutorial/Dashboard/Part_2/readme.md
similarity index 100%
rename from Tutorial/Part_2/readme.md
rename to Tutorial/Dashboard/Part_2/readme.md
diff --git a/Tutorial/Part_3/MarksSelection.css b/Tutorial/Dashboard/Part_3/MarksSelection.css
similarity index 100%
rename from Tutorial/Part_3/MarksSelection.css
rename to Tutorial/Dashboard/Part_3/MarksSelection.css
diff --git a/Tutorial/Part_3/MarksSelection.html b/Tutorial/Dashboard/Part_3/MarksSelection.html
similarity index 100%
rename from Tutorial/Part_3/MarksSelection.html
rename to Tutorial/Dashboard/Part_3/MarksSelection.html
diff --git a/Tutorial/Part_3/MarksSelection.js b/Tutorial/Dashboard/Part_3/MarksSelection.js
similarity index 100%
rename from Tutorial/Part_3/MarksSelection.js
rename to Tutorial/Dashboard/Part_3/MarksSelection.js
diff --git a/Tutorial/Part_3/readme.md b/Tutorial/Dashboard/Part_3/readme.md
similarity index 100%
rename from Tutorial/Part_3/readme.md
rename to Tutorial/Dashboard/Part_3/readme.md
diff --git a/Tutorial/Part_4/MarksSelection.css b/Tutorial/Dashboard/Part_4/MarksSelection.css
similarity index 100%
rename from Tutorial/Part_4/MarksSelection.css
rename to Tutorial/Dashboard/Part_4/MarksSelection.css
diff --git a/Tutorial/Part_4/MarksSelection.html b/Tutorial/Dashboard/Part_4/MarksSelection.html
similarity index 100%
rename from Tutorial/Part_4/MarksSelection.html
rename to Tutorial/Dashboard/Part_4/MarksSelection.html
diff --git a/Tutorial/Part_4/MarksSelection.js b/Tutorial/Dashboard/Part_4/MarksSelection.js
similarity index 100%
rename from Tutorial/Part_4/MarksSelection.js
rename to Tutorial/Dashboard/Part_4/MarksSelection.js
diff --git a/Tutorial/Part_4/readme.md b/Tutorial/Dashboard/Part_4/readme.md
similarity index 100%
rename from Tutorial/Part_4/readme.md
rename to Tutorial/Dashboard/Part_4/readme.md
diff --git a/Tutorial/Part_5/MarksSelection.css b/Tutorial/Dashboard/Part_5/MarksSelection.css
similarity index 100%
rename from Tutorial/Part_5/MarksSelection.css
rename to Tutorial/Dashboard/Part_5/MarksSelection.css
diff --git a/Tutorial/Part_5/MarksSelection.html b/Tutorial/Dashboard/Part_5/MarksSelection.html
similarity index 100%
rename from Tutorial/Part_5/MarksSelection.html
rename to Tutorial/Dashboard/Part_5/MarksSelection.html
diff --git a/Tutorial/Part_5/MarksSelection.js b/Tutorial/Dashboard/Part_5/MarksSelection.js
similarity index 100%
rename from Tutorial/Part_5/MarksSelection.js
rename to Tutorial/Dashboard/Part_5/MarksSelection.js
diff --git a/Tutorial/Part_5/readme.md b/Tutorial/Dashboard/Part_5/readme.md
similarity index 100%
rename from Tutorial/Part_5/readme.md
rename to Tutorial/Dashboard/Part_5/readme.md
diff --git a/Tutorial/Part_6/MarksSelection.css b/Tutorial/Dashboard/Part_6/MarksSelection.css
similarity index 100%
rename from Tutorial/Part_6/MarksSelection.css
rename to Tutorial/Dashboard/Part_6/MarksSelection.css
diff --git a/Tutorial/Part_6/MarksSelection.html b/Tutorial/Dashboard/Part_6/MarksSelection.html
similarity index 100%
rename from Tutorial/Part_6/MarksSelection.html
rename to Tutorial/Dashboard/Part_6/MarksSelection.html
diff --git a/Tutorial/Part_6/MarksSelection.js b/Tutorial/Dashboard/Part_6/MarksSelection.js
similarity index 100%
rename from Tutorial/Part_6/MarksSelection.js
rename to Tutorial/Dashboard/Part_6/MarksSelection.js
diff --git a/Tutorial/Part_6/readme.md b/Tutorial/Dashboard/Part_6/readme.md
similarity index 100%
rename from Tutorial/Part_6/readme.md
rename to Tutorial/Dashboard/Part_6/readme.md
diff --git a/Tutorial/ReactVersion/.env b/Tutorial/Dashboard/ReactVersion/.env
similarity index 100%
rename from Tutorial/ReactVersion/.env
rename to Tutorial/Dashboard/ReactVersion/.env
diff --git a/Tutorial/ReactVersion/.gitignore b/Tutorial/Dashboard/ReactVersion/.gitignore
similarity index 100%
rename from Tutorial/ReactVersion/.gitignore
rename to Tutorial/Dashboard/ReactVersion/.gitignore
diff --git a/Tutorial/ReactVersion/README.md b/Tutorial/Dashboard/ReactVersion/README.md
similarity index 100%
rename from Tutorial/ReactVersion/README.md
rename to Tutorial/Dashboard/ReactVersion/README.md
diff --git a/Tutorial/ReactVersion/TutorialReact.trex b/Tutorial/Dashboard/ReactVersion/TutorialReact.trex
similarity index 100%
rename from Tutorial/ReactVersion/TutorialReact.trex
rename to Tutorial/Dashboard/ReactVersion/TutorialReact.trex
diff --git a/Tutorial/ReactVersion/package.json b/Tutorial/Dashboard/ReactVersion/package.json
similarity index 77%
rename from Tutorial/ReactVersion/package.json
rename to Tutorial/Dashboard/ReactVersion/package.json
index c8646836..39ecb8ee 100644
--- a/Tutorial/ReactVersion/package.json
+++ b/Tutorial/Dashboard/ReactVersion/package.json
@@ -12,8 +12,8 @@
     "react-virtualized": "^9.21.1"
   },
   "scripts": {
-    "start": "copyfiles -f ../../lib/tableau.extensions.1.latest.js ./public && react-scripts start",
-    "build": "copyfiles -f ../../lib/tableau.extensions.1.latest.js ./public && react-scripts build",
+    "start": "copyfiles -f ../../../lib/tableau.extensions.1.latest.js ./public && react-scripts start",
+    "build": "copyfiles -f ../../../lib/tableau.extensions.1.latest.js ./public && react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
diff --git a/Tutorial/ReactVersion/public/favicon.ico b/Tutorial/Dashboard/ReactVersion/public/favicon.ico
similarity index 100%
rename from Tutorial/ReactVersion/public/favicon.ico
rename to Tutorial/Dashboard/ReactVersion/public/favicon.ico
diff --git a/Tutorial/ReactVersion/public/index.html b/Tutorial/Dashboard/ReactVersion/public/index.html
similarity index 100%
rename from Tutorial/ReactVersion/public/index.html
rename to Tutorial/Dashboard/ReactVersion/public/index.html
diff --git a/Tutorial/ReactVersion/public/robots.txt b/Tutorial/Dashboard/ReactVersion/public/robots.txt
similarity index 100%
rename from Tutorial/ReactVersion/public/robots.txt
rename to Tutorial/Dashboard/ReactVersion/public/robots.txt
diff --git a/Tutorial/ReactVersion/public/setting.svg b/Tutorial/Dashboard/ReactVersion/public/setting.svg
similarity index 100%
rename from Tutorial/ReactVersion/public/setting.svg
rename to Tutorial/Dashboard/ReactVersion/public/setting.svg
diff --git a/Tutorial/ReactVersion/public/undo-arrow.svg b/Tutorial/Dashboard/ReactVersion/public/undo-arrow.svg
similarity index 100%
rename from Tutorial/ReactVersion/public/undo-arrow.svg
rename to Tutorial/Dashboard/ReactVersion/public/undo-arrow.svg
diff --git a/Tutorial/ReactVersion/src/DataTableComponent.js b/Tutorial/Dashboard/ReactVersion/src/DataTableComponent.js
similarity index 100%
rename from Tutorial/ReactVersion/src/DataTableComponent.js
rename to Tutorial/Dashboard/ReactVersion/src/DataTableComponent.js
diff --git a/Tutorial/ReactVersion/src/LoadingIndicatorComponent.js b/Tutorial/Dashboard/ReactVersion/src/LoadingIndicatorComponent.js
similarity index 100%
rename from Tutorial/ReactVersion/src/LoadingIndicatorComponent.js
rename to Tutorial/Dashboard/ReactVersion/src/LoadingIndicatorComponent.js
diff --git a/Tutorial/ReactVersion/src/Main.js b/Tutorial/Dashboard/ReactVersion/src/Main.js
similarity index 100%
rename from Tutorial/ReactVersion/src/Main.js
rename to Tutorial/Dashboard/ReactVersion/src/Main.js
diff --git a/Tutorial/ReactVersion/src/SheetListComponent.js b/Tutorial/Dashboard/ReactVersion/src/SheetListComponent.js
similarity index 100%
rename from Tutorial/ReactVersion/src/SheetListComponent.js
rename to Tutorial/Dashboard/ReactVersion/src/SheetListComponent.js
diff --git a/Tutorial/ReactVersion/src/index.js b/Tutorial/Dashboard/ReactVersion/src/index.js
similarity index 100%
rename from Tutorial/ReactVersion/src/index.js
rename to Tutorial/Dashboard/ReactVersion/src/index.js
diff --git a/Tutorial/ReactVersion/src/styles/DataTable.css b/Tutorial/Dashboard/ReactVersion/src/styles/DataTable.css
similarity index 100%
rename from Tutorial/ReactVersion/src/styles/DataTable.css
rename to Tutorial/Dashboard/ReactVersion/src/styles/DataTable.css
diff --git a/Tutorial/ReactVersion/src/styles/LoadingIndicator.css b/Tutorial/Dashboard/ReactVersion/src/styles/LoadingIndicator.css
similarity index 100%
rename from Tutorial/ReactVersion/src/styles/LoadingIndicator.css
rename to Tutorial/Dashboard/ReactVersion/src/styles/LoadingIndicator.css
diff --git a/Tutorial/ReactVersion/src/styles/Main.css b/Tutorial/Dashboard/ReactVersion/src/styles/Main.css
similarity index 100%
rename from Tutorial/ReactVersion/src/styles/Main.css
rename to Tutorial/Dashboard/ReactVersion/src/styles/Main.css
diff --git a/Tutorial/ReactVersion/src/styles/SheetList.css b/Tutorial/Dashboard/ReactVersion/src/styles/SheetList.css
similarity index 100%
rename from Tutorial/ReactVersion/src/styles/SheetList.css
rename to Tutorial/Dashboard/ReactVersion/src/styles/SheetList.css
diff --git a/Tutorial/assets/Completed.gif b/Tutorial/Dashboard/assets/Completed.gif
similarity index 100%
rename from Tutorial/assets/Completed.gif
rename to Tutorial/Dashboard/assets/Completed.gif
diff --git a/Tutorial/assets/Part_0.png b/Tutorial/Dashboard/assets/Part_0.png
similarity index 100%
rename from Tutorial/assets/Part_0.png
rename to Tutorial/Dashboard/assets/Part_0.png
diff --git a/Tutorial/assets/Part_1.png b/Tutorial/Dashboard/assets/Part_1.png
similarity index 100%
rename from Tutorial/assets/Part_1.png
rename to Tutorial/Dashboard/assets/Part_1.png
diff --git a/Tutorial/assets/Part_2.gif b/Tutorial/Dashboard/assets/Part_2.gif
similarity index 100%
rename from Tutorial/assets/Part_2.gif
rename to Tutorial/Dashboard/assets/Part_2.gif
diff --git a/Tutorial/assets/Part_3.gif b/Tutorial/Dashboard/assets/Part_3.gif
similarity index 100%
rename from Tutorial/assets/Part_3.gif
rename to Tutorial/Dashboard/assets/Part_3.gif
diff --git a/Tutorial/assets/Part_4.gif b/Tutorial/Dashboard/assets/Part_4.gif
similarity index 100%
rename from Tutorial/assets/Part_4.gif
rename to Tutorial/Dashboard/assets/Part_4.gif
diff --git a/Tutorial/assets/Part_5.gif b/Tutorial/Dashboard/assets/Part_5.gif
similarity index 100%
rename from Tutorial/assets/Part_5.gif
rename to Tutorial/Dashboard/assets/Part_5.gif
diff --git a/Tutorial/assets/Part_6.gif b/Tutorial/Dashboard/assets/Part_6.gif
similarity index 100%
rename from Tutorial/assets/Part_6.gif
rename to Tutorial/Dashboard/assets/Part_6.gif
diff --git a/Tutorial/favicon.ico b/Tutorial/Dashboard/favicon.ico
similarity index 100%
rename from Tutorial/favicon.ico
rename to Tutorial/Dashboard/favicon.ico
diff --git a/Tutorial/readme.md b/Tutorial/Dashboard/readme.md
similarity index 100%
rename from Tutorial/readme.md
rename to Tutorial/Dashboard/readme.md
diff --git a/package.json b/package.json
index 91e5fe6d..c714145c 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
     "start": "node node_modules/http-server/bin/http-server -p 8765 -c-1",
     "start-sandbox": "npx tabextsandbox --config sandbox-config.json",
     "lint": "npm run jslint && npm run tslint",
-    "jslint": "semistandard ./Samples/*/*.js",
-    "tslint": "./node_modules/.bin/tslint --config ./tslint.json ./Samples-Typescript/*/*.ts*",
+    "jslint": "semistandard ./Samples/*/*/*.js",
+    "tslint": "./node_modules/.bin/tslint --config ./tslint.json ./Samples-Typescript/*/*/*.ts*",
     "dev": "concurrently --kill-others \"webpack --watch\" \"npm:start\""
   },
   "repository": {
diff --git a/sandbox-config.json b/sandbox-config.json
index d9083345..bd37fee6 100644
--- a/sandbox-config.json
+++ b/sandbox-config.json
@@ -3,7 +3,7 @@
 
     "extensions": {
         "uinamespace": {
-            "path": "./Samples/UINamespace-sandboxed"
+            "path": "./Samples/Dashboard/UINamespace-sandboxed"
         }
     }
 }
diff --git a/webpack.config.js b/webpack.config.js
index df8aef3c..88d4ea62 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,16 +4,16 @@ const path = require('path');
 
 module.exports = {
   entry: {
-    annotation: './Samples-Typescript/Annotation/annotation.ts',
-    dashboardLayout: './Samples-Typescript/DashboardLayout/dashboardLayout.ts',
-    datasources: './Samples-Typescript/DataSources/datasources.ts',
-    filtering: './Samples-Typescript/Filtering/filtering.ts',
-    formatting: './Samples-Typescript/Formatting/formatting.tsx',
-    moveAndResize: './Samples-Typescript/MoveAndResize/moveAndResize.tsx',
-    parameters: './Samples-Typescript/Parameters/parameters.ts',
-    dashboardObjectVisibility: './Samples-Typescript/DashboardObjectVisibility/dashboardObjectVisibility.tsx',
-    replayAnimation: './Samples-Typescript/ReplayAnimation/replayAnimation.tsx',
-    vizImage: './Samples-Typescript/VizImage/vizImage.ts'
+    annotation: './Samples-Typescript/Dashboard/Annotation/annotation.ts',
+    dashboardLayout: './Samples-Typescript/Dashboard/DashboardLayout/dashboardLayout.ts',
+    datasources: './Samples-Typescript/Dashboard/DataSources/datasources.ts',
+    filtering: './Samples-Typescript/Dashboard/Filtering/filtering.ts',
+    formatting: './Samples-Typescript/Dashboard/Formatting/formatting.tsx',
+    moveAndResize: './Samples-Typescript/Dashboard/MoveAndResize/moveAndResize.tsx',
+    parameters: './Samples-Typescript/Dashboard/Parameters/parameters.ts',
+    dashboardObjectVisibility: './Samples-Typescript/Dashboard/DashboardObjectVisibility/dashboardObjectVisibility.tsx',
+    replayAnimation: './Samples-Typescript/Dashboard/ReplayAnimation/replayAnimation.tsx',
+    vizImage: './Samples-Typescript/Dashboard/VizImage/vizImage.ts'
   },
   mode: 'production',
   output: {