diff --git a/examples/custom-element/example-element.sky b/examples/custom-element/example-element.sky
index 097d4f54e2..323a4e1704 100644
--- a/examples/custom-element/example-element.sky
+++ b/examples/custom-element/example-element.sky
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-element.sky" />
+<import src="/sky/framework/elements/sky-element.sky" />
 <sky-element>
 <template>
   <style>
diff --git a/examples/scrolling/scrolling.sky b/examples/scrolling/scrolling.sky
index 3442d7a442..da20178c75 100644
--- a/examples/scrolling/scrolling.sky
+++ b/examples/scrolling/scrolling.sky
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-element.sky" />
-<import src="/sky/framework/sky-scrollable.sky" />
+<import src="/sky/framework/elements/sky-element.sky" />
+<import src="/sky/framework/elements/sky-scrollable.sky" />
 
 <sky-element>
 <template>
diff --git a/examples/stocks/stock-arrow.sky b/examples/stocks/stock-arrow.sky
index 0ebe9cfba3..0f9b41321a 100644
--- a/examples/stocks/stock-arrow.sky
+++ b/examples/stocks/stock-arrow.sky
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-element.sky" />
+<import src="/sky/framework/elements/sky-element.sky" />
 
 <sky-element attributes="change:number">
 <template>
diff --git a/examples/stocks/stock.sky b/examples/stocks/stock.sky
index 335fada1fd..e4ace4cb56 100644
--- a/examples/stocks/stock.sky
+++ b/examples/stocks/stock.sky
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/material-element.sky" />
-<import src="/sky/framework/sky-element.sky" />
+<import src="/sky/framework/elements/material-element.sky" />
+<import src="/sky/framework/elements/sky-element.sky" />
 <import src="stock-arrow.sky" />
 
 <sky-element>
diff --git a/examples/stocks/stocks.sky b/examples/stocks/stocks.sky
index 3bcb93fce3..6b97386f21 100644
--- a/examples/stocks/stocks.sky
+++ b/examples/stocks/stocks.sky
@@ -3,14 +3,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-drawer-header.sky" />
-<import src="/sky/framework/sky-drawer.sky" />
-<import src="/sky/framework/sky-element.sky" />
-<import src="/sky/framework/sky-icon.sky" />
-<import src="/sky/framework/sky-menu-divider.sky" />
-<import src="/sky/framework/sky-menu-item.sky" />
-<import src="/sky/framework/sky-scrollable.sky" />
-<import src="/sky/framework/sky-toolbar.sky" />
+<import src="/sky/framework/elements/sky-drawer-header.sky" />
+<import src="/sky/framework/elements/sky-drawer.sky" />
+<import src="/sky/framework/elements/sky-element.sky" />
+<import src="/sky/framework/elements/sky-icon.sky" />
+<import src="/sky/framework/elements/sky-menu-divider.sky" />
+<import src="/sky/framework/elements/sky-menu-item.sky" />
+<import src="/sky/framework/elements/sky-scrollable.sky" />
+<import src="/sky/framework/elements/sky-toolbar.sky" />
 <import src="stock.sky" as='view'/>
 
 <sky-element>
diff --git a/examples/widgets/widget-root.sky b/examples/widgets/widget-root.sky
index 2aad246a5d..cc0d5fab0b 100644
--- a/examples/widgets/widget-root.sky
+++ b/examples/widgets/widget-root.sky
@@ -3,13 +3,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-box.sky" />
-<import src="/sky/framework/sky-button.sky" />
-<import src="/sky/framework/sky-checkbox.sky" />
-<import src="/sky/framework/sky-element.sky" />
-<import src="/sky/framework/sky-input.sky" />
-<import src="/sky/framework/sky-radio.sky" />
-<import src="/sky/framework/sky-scrollable.sky" />
+<import src="/sky/framework/elements/sky-box.sky" />
+<import src="/sky/framework/elements/sky-button.sky" />
+<import src="/sky/framework/elements/sky-checkbox.sky" />
+<import src="/sky/framework/elements/sky-element.sky" />
+<import src="/sky/framework/elements/sky-input.sky" />
+<import src="/sky/framework/elements/sky-radio.sky" />
+<import src="/sky/framework/elements/sky-scrollable.sky" />
 <sky-element>
 <template>
   <style>
@@ -35,7 +35,7 @@
       <sky-input id="text" value="{{ inputValue }}" />
       <div>value = {{ inputValue }}</div>
     </sky-box>
-  
+
     <sky-box title='Buttons'>
       <div style="display: flex; flex-direction: horizontal">
         <div style="flex:1" />
@@ -43,7 +43,7 @@
         <sky-button level="1" primary>CONFIRM</sky-button>
       </div>
     </sky-box>
-  
+
     <sky-box title='Checkboxes'>
       <div><sky-checkbox id='checkbox' checked='{{ checked }}'/>Checkbox</div>
       <div class="output">highlight: {{ myCheckbox.highlight }}</div>
@@ -51,7 +51,7 @@
       <div><sky-checkbox id='checkbox' checked="true"/>Checkbox, default checked.</div>
       <div class="output">checked: {{ checked }}</div>
     </sky-box>
-  
+
     <sky-box title='Radios'>
       <sky-box title='Group One'>
         <div><sky-radio group='foo'/>one</div>