royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch develop updated: Revert package names to the old structure
Date Sun, 15 Jul 2018 20:38:15 GMT
This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new bb6b290  Revert package names to the old structure
bb6b290 is described below

commit bb6b290eed9dab16f9a51bd6c73fb3f357ab5a1a
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Sun Jul 15 22:38:10 2018 +0200

    Revert package names to the old structure
---
 .../main/royale/products/ProductItemRenderer.as    |  2 +-
 .../src/main/royale/DataBindingExample.as          | 12 ++--
 .../main/royale/products/ProductItemRenderer.as    |  2 +-
 .../src/main/royale/MyInitialView.mxml             |  2 +-
 .../main/royale/products/ProductItemRenderer.as    |  2 +-
 .../ListExample/src/main/royale/MyInitialView.mxml |  2 +-
 .../main/royale/simple/IRFactoryForArrayData.as    |  2 +-
 .../mapper/DataTableMapperForArrayListData.as      |  2 +-
 .../TeamPage/src/main/royale/MyInitialView.mxml    |  2 +-
 .../Basic/src/main/resources/basic-manifest.xml    |  2 +-
 .../projects/Basic/src/main/resources/defaults.css | 80 +++++++++++-----------
 .../apache/royale/core/IScrollingLayoutParent.as   |  2 +-
 .../main/royale/org/apache/royale/html/Alert.as    |  4 +-
 .../royale/org/apache/royale/html/ControlBar.as    |  4 +-
 .../royale/org/apache/royale/html/DataContainer.as |  4 +-
 .../royale/org/apache/royale/html/DropDownList.as  |  2 +-
 .../main/royale/org/apache/royale/html/Panel.as    |  4 +-
 .../royale/org/apache/royale/html/SimpleAlert.as   |  4 +-
 .../html/accessories/NumericOnlyTextInputBead.as   |  2 +-
 .../royale/html/accessories/PasswordInputBead.as   |  2 +-
 .../royale/html/beads/AccordionCollapseBead.as     |  2 +-
 .../org/apache/royale/html/beads/AlertView.as      |  6 +-
 .../royale/html/beads/BackgroundImageBead.as       |  2 +-
 .../org/apache/royale/html/beads/ButtonBarView.as  |  2 +-
 .../org/apache/royale/html/beads/DataGridView.as   |  4 +-
 .../beads/DataItemRendererFactoryForArrayData.as   |  4 +-
 .../beads/DataItemRendererFactoryForArrayList.as   |  2 +-
 .../DataItemRendererFactoryForCollectionView.as    |  4 +-
 .../beads/DataItemRendererFactoryForColumnData.as  |  2 +-
 .../apache/royale/html/beads/DateChooserView.as    |  2 +-
 .../royale/html/beads/DispatchInputFinishedBead.as |  2 +-
 .../royale/html/beads/DispatchKeyboardEventBead.as |  2 +-
 .../apache/royale/html/beads/DropDownListView.as   |  2 +-
 .../DynamicItemsRendererFactoryForArrayListData.as |  2 +-
 .../org/apache/royale/html/beads/ListView.as       |  6 +-
 .../royale/html/beads/MultilineTextFieldView.as    |  2 +-
 .../apache/royale/html/beads/NumericStepperView.as |  2 +-
 .../org/apache/royale/html/beads/PanelView.as      |  2 +-
 .../apache/royale/html/beads/SimpleAlertView.as    |  4 +-
 .../royale/html/beads/SingleLineBorderBead.as      |  2 +-
 .../royale/html/beads/SolidBackgroundBead.as       |  2 +-
 .../org/apache/royale/html/beads/TableCellView.as  |  2 +-
 .../org/apache/royale/html/beads/TextAreaView.as   |  4 +-
 .../org/apache/royale/html/beads/TextFieldView.as  |  2 +-
 .../org/apache/royale/html/beads/TextInputView.as  |  2 +-
 .../royale/html/beads/TextInputWithBorderView.as   |  2 +-
 .../org/apache/royale/html/beads/TreeGridView.as   |  4 +-
 .../royale/html/beads/VirtualDataContainerView.as  |  8 +--
 .../VirtualDataItemRendererFactoryForArrayData.as  |  2 +-
 .../apache/royale/html/beads/VirtualListView.as    |  4 +-
 .../beads/controllers/DropDownListController.as    |  2 +-
 .../controllers/EditableTextKeyboardController.as  |  2 +-
 .../ListSingleSelectionMouseController.as          |  4 +-
 .../royale/html/beads/layouts/ButtonBarLayout.as   |  2 +-
 .../layouts/FlexibleFirstChildHorizontalLayout.as  |  2 +-
 .../royale/html/beads/models/ButtonBarModel.as     |  2 +-
 .../royale/html/beads/models/ComboBoxModel.as      |  4 +-
 .../royale/html/beads/models/DataGridModel.as      |  4 +-
 .../royale/html/beads/models/MenuBarModel.as       |  2 +-
 .../apache/royale/html/beads/models/MenuModel.as   |  2 +-
 .../supportClasses/ButtonBarButtonItemRenderer.as  |  2 +-
 .../supportClasses/CascadingMenuItemRenderer.as    |  2 +-
 .../royale/html/supportClasses/DateChooserList.as  |  2 +-
 .../html/supportClasses/MenuBarItemRenderer.as     |  2 +-
 .../royale/html/supportClasses/MenuItemRenderer.as |  2 +-
 .../html/supportClasses/ScrollingViewport.as       |  2 +-
 .../html/supportClasses/StringItemRenderer.as      |  2 +-
 .../supportClasses/TreeGridControlItemRenderer.as  |  2 +-
 .../Charts/src/main/resources/defaults.css         | 12 ++--
 .../charts/beads/ChartItemRendererFactory.as       |  2 +-
 ...ataItemRendererFactoryForSeriesArrayListData.as |  2 +-
 .../beads/DataItemRendererFactoryForSeriesData.as  |  2 +-
 .../org/apache/royale/charts/beads/DataTipBead.as  |  2 +-
 .../charts/beads/HorizontalCategoryAxisBead.as     |  2 +-
 .../charts/beads/HorizontalLinearAxisBead.as       |  2 +-
 .../charts/beads/VerticalCategoryAxisBead.as       |  2 +-
 .../royale/charts/beads/VerticalLinearAxisBead.as  |  2 +-
 .../controllers/ChartSeriesMouseController.as      |  2 +-
 .../beads/models/ChartArraySelectionModel.as       |  2 +-
 .../royale/charts/optimized/SVGBoxItemRenderer.as  |  2 +-
 .../royale/charts/optimized/SVGChartDataGroup.as   |  2 +-
 .../charts/optimized/SVGLineSegmentItemRenderer.as |  2 +-
 .../charts/optimized/SVGWedgeItemRenderer.as       |  2 +-
 .../charts/supportClasses/BoxItemRenderer.as       |  2 +-
 .../royale/charts/supportClasses/ChartDataGroup.as |  4 +-
 .../supportClasses/LineSegmentItemRenderer.as      |  2 +-
 .../charts/supportClasses/WedgeItemRenderer.as     |  2 +-
 .../Core/src/main/resources/basic-manifest.xml     | 14 ++--
 .../projects/Core/src/main/royale/CoreClasses.as   | 37 +++++-----
 .../org/apache/royale/core/DataContainerBase.as    |  4 +-
 .../apache/royale/core/StyledMXMLItemRenderer.as   |  1 +
 .../apache/royale/{core => html}/MXMLBeadView.as   |  4 +-
 .../beads/views => html/beads}/ContainerView.as    | 10 +--
 .../views => html/beads}/DataContainerView.as      |  6 +-
 .../royale/{core => html}/beads/GroupView.as       |  2 +-
 .../royale/{core => html}/beads/IBackgroundBead.as |  2 +-
 .../royale/{core => html}/beads/IBorderBead.as     |  2 +-
 .../{core => html}/beads/IDropDownListView.as      |  2 +-
 .../royale/{core => html/beads}/IListView.as       |  2 +-
 .../royale/{core => html}/beads/ITextFieldView.as  |  2 +-
 .../{core => html}/beads/TextFieldViewBase.as      |  2 +-
 .../beads/layouts/LayoutChangeNotifier.as          |  2 +-
 .../beads/models/ArraySelectionModel.as            |  2 +-
 .../{core => html}/beads/models/ViewportModel.as   |  2 +-
 .../royale/{core => html}/supportClasses/Border.as |  2 +-
 .../supportClasses/ContainerContentArea.as         |  2 +-
 .../{core => html}/supportClasses/DataGroup.as     |  4 +-
 .../supportClasses}/DataItemRenderer.as            |  2 +-
 .../supportClasses}/MXMLItemRenderer.as            |  2 +-
 .../supportClasses}/UIItemRendererBase.as          |  2 +-
 .../{core => html}/supportClasses/Viewport.as      |  2 +-
 .../effects/beads/EasyAccordionCollapseBead.as     |  2 +-
 .../Express/src/main/resources/defaults.css        | 12 ++--
 .../main/royale/org/apache/royale/express/List.as  |  2 +-
 .../org/apache/royale/express/MXMLItemRenderer.as  |  4 +-
 .../projects/Flat/src/main/resources/defaults.css  | 38 +++++-----
 .../royale/org/apache/royale/flat/DropDownList.as  |  2 +-
 .../apache/royale/flat/beads/DropDownListView.as   |  2 +-
 .../projects/Jewel/src/main/resources/defaults.css | 30 ++++----
 .../royale/org/apache/royale/jewel/DropDownList.as |  2 +-
 .../DataItemRendererFactoryForCollectionView.as    |  4 +-
 .../beads/controllers/DropDownListController.as    |  2 +-
 .../ListSingleSelectionMouseController.as          |  2 +-
 .../beads/controls/textinput/PasswordInput.as      |  2 +-
 .../apache/royale/jewel/beads/views/AlertView.as   |  6 +-
 .../royale/jewel/beads/views/DropDownListView.as   |  2 +-
 .../apache/royale/jewel/beads/views/ListView.as    |  2 +-
 .../royale/jewel/beads/views/TextFieldView.as      |  2 +-
 .../jewel/supportClasses/ScrollingViewport.as      |  2 +-
 .../projects/Jewel/src/main/sass/_global.sass      | 14 ++--
 .../sass/components/_applicationmaincontent.sass   |  6 +-
 .../src/main/sass/components/_controlbar.sass      |  2 +-
 .../src/main/sass/components/_dropdownlist.sass    |  4 +-
 .../Jewel/src/main/sass/components/_list.sass      |  6 +-
 .../src/main/royale/mx/core/UIComponent.as         |  2 +-
 .../MXRoyale/src/main/royale/mx/skins/Border.as    |  4 +-
 .../src/main/resources/defaults.css                |  8 +--
 .../TabsDataItemRendererFactoryForArrayListData.as |  4 +-
 .../beads/TabsItemRendererFactoryForArrayData.as   |  2 +-
 .../royale/mdl/beads/models/DropDownListModel.as   |  2 +-
 .../royale/mdl/beads/models/TabArrayModel.as       |  2 +-
 .../royale/mdl/beads/views/DropDownListView.as     |  2 +-
 .../mdl/itemRenderers/DropDownListItemRenderer.as  |  2 +-
 .../mdl/itemRenderers/FooterLinkItemRenderer.as    |  2 +-
 .../royale/mdl/itemRenderers/ListItemRenderer.as   |  2 +-
 .../royale/mdl/itemRenderers/MenuItemRenderer.as   |  2 +-
 .../itemRenderers/NavigationLinkItemRenderer.as    |  2 +-
 .../mdl/itemRenderers/TableRowItemRenderer.as      |  2 +-
 .../supportClasses/TabBarButtonItemRendererBase.as |  2 +-
 .../mdl/supportClasses/TabItemRendererBase.as      |  2 +-
 .../royale/mobile/beads/ViewManagerViewBase.as     |  2 +-
 151 files changed, 313 insertions(+), 311 deletions(-)

diff --git a/examples/express/DataGridExample/src/main/royale/products/ProductItemRenderer.as b/examples/express/DataGridExample/src/main/royale/products/ProductItemRenderer.as
index 03751f4..89e6862 100644
--- a/examples/express/DataGridExample/src/main/royale/products/ProductItemRenderer.as
+++ b/examples/express/DataGridExample/src/main/royale/products/ProductItemRenderer.as
@@ -19,7 +19,7 @@
 package products
 {
 	import org.apache.royale.html.Image;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 
 	public class ProductItemRenderer extends DataItemRenderer
 	{
diff --git a/examples/royale/DataBindingExample_as/src/main/royale/DataBindingExample.as b/examples/royale/DataBindingExample_as/src/main/royale/DataBindingExample.as
index 0e4942f..a6c2874 100644
--- a/examples/royale/DataBindingExample_as/src/main/royale/DataBindingExample.as
+++ b/examples/royale/DataBindingExample_as/src/main/royale/DataBindingExample.as
@@ -23,8 +23,8 @@ import org.apache.royale.core.Application;
 import org.apache.royale.core.ItemRendererClassFactory;
 import org.apache.royale.core.SimpleCSSValuesImpl;
 import org.apache.royale.events.Event;
-import org.apache.royale.core.beads.views.ContainerView;
-import org.apache.royale.core.beads.GroupView;
+import org.apache.royale.html.beads.ContainerView;
+import org.apache.royale.html.beads.GroupView;
 import org.apache.royale.html.beads.DataItemRendererFactoryForArrayData;
 import org.apache.royale.html.beads.ListView;
 import org.apache.royale.html.beads.TextItemRendererFactoryForArrayData;
@@ -32,13 +32,13 @@ import org.apache.royale.html.beads.controllers.ItemRendererMouseController;
 import org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController;
 import org.apache.royale.html.beads.layouts.BasicLayout;
 import org.apache.royale.html.beads.layouts.VerticalLayout;
-import org.apache.royale.core.beads.models.ArraySelectionModel;
+import org.apache.royale.html.beads.models.ArraySelectionModel;
 import org.apache.royale.html.beads.models.TextModel;
 import org.apache.royale.html.beads.models.ToggleButtonModel;
-import org.apache.royale.core.beads.models.ViewportModel;
-import org.apache.royale.core.supportClasses.ContainerContentArea;
+import org.apache.royale.html.beads.models.ViewportModel;
+import org.apache.royale.html.supportClasses.ContainerContentArea;
 import org.apache.royale.html.supportClasses.DropDownListList;
-import org.apache.royale.core.supportClasses.DataGroup;
+import org.apache.royale.html.supportClasses.DataGroup;
 import org.apache.royale.html.supportClasses.ScrollingViewport;
 import org.apache.royale.core.supportClasses.Viewport;
 import org.apache.royale.html.supportClasses.StringItemRenderer;
diff --git a/examples/royale/DataGridExample/src/main/royale/products/ProductItemRenderer.as b/examples/royale/DataGridExample/src/main/royale/products/ProductItemRenderer.as
index 03751f4..89e6862 100644
--- a/examples/royale/DataGridExample/src/main/royale/products/ProductItemRenderer.as
+++ b/examples/royale/DataGridExample/src/main/royale/products/ProductItemRenderer.as
@@ -19,7 +19,7 @@
 package products
 {
 	import org.apache.royale.html.Image;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 
 	public class ProductItemRenderer extends DataItemRenderer
 	{
diff --git a/examples/royale/DragAndDropExample/src/main/royale/MyInitialView.mxml b/examples/royale/DragAndDropExample/src/main/royale/MyInitialView.mxml
index 5a48211..48224d8 100644
--- a/examples/royale/DragAndDropExample/src/main/royale/MyInitialView.mxml
+++ b/examples/royale/DragAndDropExample/src/main/royale/MyInitialView.mxml
@@ -50,7 +50,7 @@ limitations under the License.
 		.DragDropList
 		{
 			IBeadView: ClassReference("org.apache.royale.html.beads.DragDropListView");
-			IContentView: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+			IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 			border: solid 1px black;
 		}
 		
diff --git a/examples/royale/DragAndDropExample/src/main/royale/products/ProductItemRenderer.as b/examples/royale/DragAndDropExample/src/main/royale/products/ProductItemRenderer.as
index 03751f4..89e6862 100644
--- a/examples/royale/DragAndDropExample/src/main/royale/products/ProductItemRenderer.as
+++ b/examples/royale/DragAndDropExample/src/main/royale/products/ProductItemRenderer.as
@@ -19,7 +19,7 @@
 package products
 {
 	import org.apache.royale.html.Image;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 
 	public class ProductItemRenderer extends DataItemRenderer
 	{
diff --git a/examples/royale/ListExample/src/main/royale/MyInitialView.mxml b/examples/royale/ListExample/src/main/royale/MyInitialView.mxml
index 8ca5a76..cc5880d 100644
--- a/examples/royale/ListExample/src/main/royale/MyInitialView.mxml
+++ b/examples/royale/ListExample/src/main/royale/MyInitialView.mxml
@@ -37,7 +37,7 @@ limitations under the License.
 			IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");		
 			IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");	
 			IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
-			IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");		
+			IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");		
 			
 			overflow: auto;
 			border: 1px solid #CCCCCC;
diff --git a/examples/royale/ListExample/src/main/royale/simple/IRFactoryForArrayData.as b/examples/royale/ListExample/src/main/royale/simple/IRFactoryForArrayData.as
index 474f0d2..f5418eb 100644
--- a/examples/royale/ListExample/src/main/royale/simple/IRFactoryForArrayData.as
+++ b/examples/royale/ListExample/src/main/royale/simple/IRFactoryForArrayData.as
@@ -34,7 +34,7 @@ package simple
 	import org.apache.royale.events.EventDispatcher;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.events.ItemRendererEvent;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 
 	[Event(name="itemRendererCreated",type="org.apache.royale.events.ItemRendererEvent")]
 
diff --git a/examples/royale/TableExample/src/main/royale/dataTable/mapper/DataTableMapperForArrayListData.as b/examples/royale/TableExample/src/main/royale/dataTable/mapper/DataTableMapperForArrayListData.as
index 73dd719..6cfb9dd 100644
--- a/examples/royale/TableExample/src/main/royale/dataTable/mapper/DataTableMapperForArrayListData.as
+++ b/examples/royale/TableExample/src/main/royale/dataTable/mapper/DataTableMapperForArrayListData.as
@@ -32,7 +32,7 @@ package dataTable.mapper
 	import org.apache.royale.html.TableCell;
 	import org.apache.royale.html.TableHeader;
 	import org.apache.royale.html.TableRow;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	
 	public class DataTableMapperForArrayListData implements IBead
 	{
diff --git a/examples/royale/TeamPage/src/main/royale/MyInitialView.mxml b/examples/royale/TeamPage/src/main/royale/MyInitialView.mxml
index ec77528..e0e1aab 100644
--- a/examples/royale/TeamPage/src/main/royale/MyInitialView.mxml
+++ b/examples/royale/TeamPage/src/main/royale/MyInitialView.mxml
@@ -28,7 +28,7 @@ limitations under the License.
 		@namespace js  "library://ns.apache.org/royale/basic";
 		
 		.Repeater {
-			IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
+			IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
 			border: none;
 			border-width: 0px;
 		}
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 025532b..316e74b 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -152,7 +152,7 @@
     <component id="ScrollingViewport" class="org.apache.royale.html.supportClasses.ScrollingViewport" />
     <component id="HScrollViewport" class="org.apache.royale.html.supportClasses.HScrollViewport" />
     <component id="VScrollViewport" class="org.apache.royale.html.supportClasses.VScrollViewport" />
-    <component id="ClippingViewport" class="org.apache.royale.core.supportClasses.Viewport" lookupOnly="true" />
+    <component id="ClippingViewport" class="org.apache.royale.html.supportClasses.Viewport" lookupOnly="true" />
     <component id="OverflowViewport" class="org.apache.royale.html.supportClasses.OverflowViewport" />
     <component id="InfiniteVScroller" class="org.apache.royale.html.beads.InfiniteVScroller" />
 
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index e3ad5e9..61d2d3b 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -69,7 +69,7 @@ ComboBox
 
 ComboBoxList
 {
-	IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+	IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
 	IBeadView:  ClassReference("org.apache.royale.html.beads.ListView");			
 	IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
@@ -77,7 +77,7 @@ ComboBoxList
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
 	IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	border-style: solid;
 	border-radius: 4px;
 	border-color: #000000;
@@ -87,16 +87,16 @@ ComboBoxList
 
 Container
 {
-	IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.BasicLayout");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	align-items: flex-start;
 }
 
 ControlBar
 {
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.HorizontalFlexLayout");
 	
 	padding: 2px;
@@ -108,13 +108,13 @@ ControlBar
 DataContainer
 {
 	IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataProviderModel");
-	IBeadView:  ClassReference("org.apache.royale.core.beads.views.DataContainerView");			
+	IBeadView:  ClassReference("org.apache.royale.html.beads.DataContainerView");			
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
 	IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 }
 
 /* ASJS */
@@ -157,8 +157,8 @@ DataGridColumnList {
 	IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	border-style: none;
 	background-color: #FFFFFF;
 }
@@ -167,7 +167,7 @@ DataGridListArea {
 	background-color: #FFFFFF;
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.HorizontalLayout");
 	IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	flex-grow: 1;
 }
 
@@ -191,8 +191,8 @@ DynamicDataGridColumnList {
 	IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	border-style: none;
 	background-color: #FFFFFF;
 }
@@ -292,11 +292,11 @@ VDividedContainerDivider {
 /* Groups */
 
 Form {
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
 }
 
 Group {
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
 }
 
 HGroup {
@@ -317,7 +317,7 @@ RangeStepper {
 
 HContainer
 {
-	IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.HorizontalLayout");
 	white-space: nowrap;
 }
@@ -362,13 +362,13 @@ ImageButton:active
 
 VContainer
 {
-	IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
 }
 
 List
 {
-	IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+	IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
 	IBeadView:  ClassReference("org.apache.royale.html.beads.ListView");			
 	IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
@@ -376,7 +376,7 @@ List
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
 	IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 }
 
 DynamicList
@@ -389,7 +389,7 @@ DynamicList
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
 	IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	border-style: solid;
 	border-color: #222222;
 	background-color: #FFFFFF;
@@ -457,15 +457,15 @@ CascadingMenuItemRenderer {
 
 Accordion
 {
-	IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+	IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
 	IBeadView:  ClassReference("org.apache.royale.html.beads.AccordionView");			
 	IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.OneFlexibleChildVerticalLayoutForOverflow");
 	IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.AccordionItemRenderer");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	IAccordionCollapseBead: ClassReference("org.apache.royale.html.beads.AccordionCollapseBead");
 	border-style: solid;
 	border-color: #222222;
@@ -499,7 +499,7 @@ Tree
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.TreeItemRenderer");
 	IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	border: 1px solid #222222;
 }
 
@@ -515,7 +515,7 @@ TreeGridListArea {
 	background-color: #FFFFFF;
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.BasicLayout");
 	IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	position: absolute;
 	flex-grow: 1;
 }
@@ -557,7 +557,7 @@ PopUpList
 	
 SimpleList
 {
-	IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+	IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
 	IBeadView:  ClassReference("org.apache.royale.html.beads.ListView");
 	IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
@@ -565,7 +565,7 @@ SimpleList
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
 	IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 }
 
 Slider
@@ -685,7 +685,7 @@ ToolTip
 
 View
 {
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.BasicLayout");
 }
 
@@ -713,7 +713,7 @@ global
 	}
 
 	Accordion {
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 	}
 	
 	Alert
@@ -738,7 +738,7 @@ global
 	
 	ButtonBar
 	{
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 	}
 	
 	CheckBox
@@ -766,7 +766,7 @@ global
 	{
 		IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
 		IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.ContainerContentArea");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.ContainerContentArea");
 	}
 	
 	ControlBar
@@ -791,13 +791,13 @@ global
 	DataContainer {
 		IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
 		IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 		font-size: 11px;
 		font-family: Arial;
 	}
 	
 	DataGridButtonBar {
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 	}
 	
 	DateChooserList {
@@ -829,7 +829,7 @@ global
 	
 	DropDownList
 	{
-		IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+		IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
 		IBeadView: ClassReference("org.apache.royale.html.beads.DropDownListView");
 		IBeadController: ClassReference("org.apache.royale.html.beads.controllers.DropDownListController");
 		IPopUp: ClassReference("org.apache.royale.html.supportClasses.DropDownListList");
@@ -839,7 +839,7 @@ global
 	
 	DropDownListList
 	{
-		IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+		IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
 		IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.TextItemRendererFactoryForArrayData");
 		IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 		IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
@@ -889,7 +889,7 @@ global
 		iBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
 		iBorderBead: ClassReference('org.apache.royale.html.beads.SingleLineBorderBead');
 		iBorderModel: ClassReference('org.apache.royale.html.beads.models.SingleLineBorderModel');
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 		font-size: 11px;
 		font-family: Arial;
 	}
@@ -915,14 +915,14 @@ global
 	
 	Panel
 	{
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.ContainerContentArea");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.ContainerContentArea");
 		IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
 		IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");    
 	}
 	
 	PanelWithControlBar
 	{
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.ContainerContentArea");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.ContainerContentArea");
 		IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
 		IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
 	}
@@ -1020,7 +1020,7 @@ global
 	}
 	
 	Tree {
-		IContentView: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+		IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 	}
 	
 	/*
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IScrollingLayoutParent.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IScrollingLayoutParent.as
index eb1d7cc..fb9f933 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IScrollingLayoutParent.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IScrollingLayoutParent.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.core
 {
-	import org.apache.royale.core.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.Border;
 	import org.apache.royale.html.supportClasses.ScrollBar;
 
     /**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Alert.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Alert.as
index 07730ff..c377673 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Alert.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Alert.as
@@ -32,8 +32,8 @@ package org.apache.royale.html
 	 *  org.apache.royale.core.IBeadModel: the data model for the Alert.
 	 *  org.apache.royale.core.IBeadView: the bead used to create the parts of the Alert.
 	 *  org.apache.royale.core.IBeadController: the bead used to handle input events.
-	 *  org.apache.royale.core.beads.IBorderBead: if present, draws a border around the Alert.
-	 *  org.apache.royale.core.beads.IBackgroundBead: if present, places a solid color background below the Alert.
+	 *  org.apache.royale.html.beads.IBorderBead: if present, draws a border around the Alert.
+	 *  org.apache.royale.html.beads.IBackgroundBead: if present, places a solid color background below the Alert.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ControlBar.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ControlBar.as
index 2266441..d1f22a8 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ControlBar.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ControlBar.as
@@ -40,8 +40,8 @@ package org.apache.royale.html
 	 *
 	 *  org.apache.royale.core.IBeadModel: the data model for the component.
 	 *  org.apache.royale.core.IMeasurementBead: helps determine the overlay size of the ControlBar for layout.
-	 *  org.apache.royale.core.beads.IBorderBead: if present, displays a border around the component.
-	 *  org.apache.royale.core.beads.IBackgroundBead: if present, displays a solid background below the ControlBar.
+	 *  org.apache.royale.html.beads.IBorderBead: if present, displays a border around the component.
+	 *  org.apache.royale.html.beads.IBackgroundBead: if present, displays a solid background below the ControlBar.
 	 *
      *  @toplevel
 	 *  @langversion 3.0
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
index 6c9ab87..40e8d75 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
@@ -41,12 +41,12 @@ package org.apache.royale.html
     {
         import org.apache.royale.core.WrappedHTMLElement;
         import org.apache.royale.html.beads.ListView;
-        import org.apache.royale.core.supportClasses.DataGroup;
+        import org.apache.royale.html.supportClasses.DataGroup;
     }
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.html.beads.models.ListPresentationModel;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 
 	/**
 	 *  Indicates that the initialization of the list is complete.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
index 325b358..e4b49e8 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as
@@ -24,7 +24,7 @@ package org.apache.royale.html
     {
         import goog.events;
         import org.apache.royale.core.WrappedHTMLElement;
-        import org.apache.royale.core.beads.models.ArraySelectionModel;
+        import org.apache.royale.html.beads.models.ArraySelectionModel;
         import org.apache.royale.html.util.addElementToWrapper;
     }
 
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Panel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Panel.as
index bc09b1f..0073592 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Panel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Panel.as
@@ -40,8 +40,8 @@ package org.apache.royale.html
 	 *  org.apache.royale.core.IBeadModel: the data model for the Panel that includes the title and whether
 	 *  or not to display the close button.
 	 *  org.apache.royale.core.IBeadView: creates the parts of the Panel.
-	 *  org.apache.royale.core.beads.IBorderBead: if present, draws a border around the Panel.
-	 *  org.apache.royale.core.beads.IBackgroundBead: if present, provides a colored background for the Panel.
+	 *  org.apache.royale.html.beads.IBorderBead: if present, draws a border around the Panel.
+	 *  org.apache.royale.html.beads.IBackgroundBead: if present, provides a colored background for the Panel.
 	 *  
      *  @toplevel
 	 *  @see PanelWithControlBar
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleAlert.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleAlert.as
index 3ac323f..802bc65 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleAlert.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleAlert.as
@@ -33,8 +33,8 @@ package org.apache.royale.html
 	 *  org.apache.royale.core.IBeadModel: the data model, which includes the message.
 	 *  org.apache.royale.core.IBeadView:  the bead that constructs the visual parts of the Alert.
 	 *  org.apache.royale.core.IBeadController: the bead responsible for handling input events.
-	 *  org.apache.royale.core.beads.IBorderBead: a bead, if present, that draws a border around the control.
-	 *  org.apache.royale.core.beads.IBackgroundBead: a bead, if present, that creates a solid-color background.
+	 *  org.apache.royale.html.beads.IBorderBead: a bead, if present, that draws a border around the control.
+	 *  org.apache.royale.html.beads.IBackgroundBead: a bead, if present, that creates a solid-color background.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/NumericOnlyTextInputBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/NumericOnlyTextInputBead.as
index 7bf2a9a..b81749e 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/NumericOnlyTextInputBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/NumericOnlyTextInputBead.as
@@ -35,7 +35,7 @@ package org.apache.royale.html.accessories
 	import org.apache.royale.events.IEventDispatcher;
 	COMPILE::SWF
 	{
-		import org.apache.royale.core.beads.ITextFieldView;			
+		import org.apache.royale.html.beads.ITextFieldView;			
 	}
 	
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/PasswordInputBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/PasswordInputBead.as
index ad3413f..2996991 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/PasswordInputBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/PasswordInputBead.as
@@ -29,7 +29,7 @@ package org.apache.royale.html.accessories
 	import org.apache.royale.events.IEventDispatcher;
 	COMPILE::SWF
 	{
-		import org.apache.royale.core.beads.ITextFieldView;
+		import org.apache.royale.html.beads.ITextFieldView;
 	}
 	
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AccordionCollapseBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AccordionCollapseBead.as
index 4b648d5..4b3b2e1 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AccordionCollapseBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AccordionCollapseBead.as
@@ -27,7 +27,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.html.beads.layouts.IOneFlexibleChildLayout;
 	import org.apache.royale.html.supportClasses.ICollapsible;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	
 	public class AccordionCollapseBead implements IAccordionCollapseBead
 	{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as
index 74dc371..e7de709 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-	import org.apache.royale.core.beads.GroupView;
+	import org.apache.royale.html.beads.GroupView;
     import org.apache.royale.core.BeadViewBase;
 	import org.apache.royale.core.IAlertModel;
 	import org.apache.royale.core.IBead;
@@ -47,8 +47,8 @@ package org.apache.royale.html.beads
         import org.apache.royale.core.ValuesManager;
         import org.apache.royale.utils.loadBeadFromValuesManager;
         import org.apache.royale.core.IMeasurementBead;
-		import org.apache.royale.core.beads.IBackgroundBead;
-		import org.apache.royale.core.beads.IBorderBead;
+		import org.apache.royale.html.beads.IBackgroundBead;
+		import org.apache.royale.html.beads.IBorderBead;
 	}
 	
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as
index 2b69620..ff9612c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as
@@ -31,7 +31,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.core.ValuesManager;
 
-	import org.apache.royale.core.beads.IBackgroundBead;
+	import org.apache.royale.html.beads.IBackgroundBead;
 	
 	/**
 	 *  The BackgroundImageBead is used to render an image as the background to any component
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ButtonBarView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ButtonBarView.as
index 1b10031..90ebfbd 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ButtonBarView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ButtonBarView.as
@@ -26,7 +26,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.Border;
 
 	/**
 	 *  The ButtonBarView class creates the visual elements of the org.apache.royale.html.ButtonBar 
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
index 1019da8..438e2d4 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-	import org.apache.royale.core.beads.GroupView;
+	import org.apache.royale.html.beads.GroupView;
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.core.IBeadModel;
 	import org.apache.royale.core.IBeadView;
@@ -36,7 +36,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.html.beads.layouts.ButtonBarLayout;
 	import org.apache.royale.html.supportClasses.IDataGridColumnList;
 	import org.apache.royale.html.supportClasses.IDataGridColumn;
-	import org.apache.royale.core.supportClasses.Viewport;
+	import org.apache.royale.html.supportClasses.Viewport;
 
 		/**
 		 *  The DataGridView class is the visual bead for the org.apache.royale.html.DataGrid.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayData.as
index e04e2ba..dc1f1c4 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayData.as
@@ -40,7 +40,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.IChild;
 	import org.apache.royale.core.ILayoutHost;
 	import org.apache.royale.core.IParentIUIBase;
-    import org.apache.royale.core.DataItemRenderer;
+    import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
 
     [Event(name="itemRendererCreated",type="org.apache.royale.events.ItemRendererEvent")]
@@ -162,7 +162,7 @@ package org.apache.royale.html.beads
 		 *  @royaleignorecoercion org.apache.royale.core.IListPresentationModel
 		 *  @royaleignorecoercion org.apache.royale.core.UIBase
 		 *  @royaleignorecoercion org.apache.royale.core.ISelectableItemRenderer
-		 *  @royaleignorecoercion org.apache.royale.core.DataItemRenderer
+		 *  @royaleignorecoercion org.apache.royale.html.supportClasses.DataItemRenderer
 		 *  @royaleignorecoercion org.apache.royale.events.IEventDispatcher
          */		
 		protected function dataProviderChangeHandler(event:Event):void
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
index ae24369..a24ede7 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
@@ -33,7 +33,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.events.EventDispatcher;
 	import org.apache.royale.events.ItemRendererEvent;
-    import org.apache.royale.core.DataItemRenderer;
+    import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
 
 	import org.apache.royale.core.IList;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
index 336dee5..0676264 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
@@ -36,9 +36,9 @@ package org.apache.royale.html.beads
 	import org.apache.royale.events.EventDispatcher;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.html.supportClasses.StringItemRenderer;
-	import org.apache.royale.core.UIItemRendererBase;
+	import org.apache.royale.html.supportClasses.UIItemRendererBase;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 
 	
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForColumnData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForColumnData.as
index d3634f4..3212bbf 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForColumnData.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForColumnData.as
@@ -29,7 +29,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.ValuesManager;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
 	
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as
index 292d7ea..e8cd4ea 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as
@@ -32,7 +32,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.html.Group;
 	import org.apache.royale.html.List;
 	import org.apache.royale.html.TextButton;
-	import org.apache.royale.core.beads.GroupView;
+	import org.apache.royale.html.beads.GroupView;
 	import org.apache.royale.html.beads.layouts.HorizontalLayout;
 	import org.apache.royale.html.beads.layouts.HorizontalFlexLayout;
 	import org.apache.royale.html.beads.layouts.TileLayout;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchInputFinishedBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchInputFinishedBead.as
index 06f76a0..e2c73b7 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchInputFinishedBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchInputFinishedBead.as
@@ -36,7 +36,7 @@ package org.apache.royale.html.beads
 		{
 			import flash.events.FocusEvent;
 			import flash.events.KeyboardEvent;
-			import org.apache.royale.core.beads.ITextFieldView;
+			import org.apache.royale.html.beads.ITextFieldView;
 			import org.apache.royale.events.utils.WhitespaceKeys;
 		}
 		
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchKeyboardEventBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchKeyboardEventBead.as
index f53f4cd..2559443 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchKeyboardEventBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchKeyboardEventBead.as
@@ -35,7 +35,7 @@ package org.apache.royale.html.beads
 	COMPILE::SWF
 	{
 		import flash.events.KeyboardEvent;
-		import org.apache.royale.core.beads.ITextFieldView;
+		import org.apache.royale.html.beads.ITextFieldView;
 	}
 	
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as
index 339fdad..f446466 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as
@@ -38,7 +38,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.utils.SolidBorderUtil;
 	import org.apache.royale.utils.UIUtils;
-    import org.apache.royale.core.beads.IDropDownListView;
+    import org.apache.royale.html.beads.IDropDownListView;
     
     /**
      *  The DropDownListView class is the default view for
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicItemsRendererFactoryForArrayListData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicItemsRendererFactoryForArrayListData.as
index d0ba866..1e97f4c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicItemsRendererFactoryForArrayListData.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicItemsRendererFactoryForArrayListData.as
@@ -35,7 +35,7 @@ package org.apache.royale.html.beads
     import org.apache.royale.events.Event;
     import org.apache.royale.events.EventDispatcher;
     import org.apache.royale.events.IEventDispatcher;
-    import org.apache.royale.core.IListView;
+    import org.apache.royale.html.beads.IListView;
     import org.apache.royale.utils.loadBeadFromValuesManager;
 
     [Event(name="itemRendererCreated",type="org.apache.royale.events.ItemRendererEvent")]
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListView.as
index f76119c..2adffd7 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-	import org.apache.royale.core.beads.views.DataContainerView;
+	import org.apache.royale.html.beads.DataContainerView;
 	import org.apache.royale.core.BeadViewBase;
 	import org.apache.royale.core.ContainerBase;
 	import org.apache.royale.core.IBead;
@@ -40,8 +40,8 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.ValuesManager;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.supportClasses.Border;
-	import org.apache.royale.core.supportClasses.DataGroup;
+	import org.apache.royale.html.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.DataGroup;
 
 	/**
 	 *  The List class creates the visual elements of the org.apache.royale.html.List
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/MultilineTextFieldView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/MultilineTextFieldView.as
index 14a4aa0..8b7458d 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/MultilineTextFieldView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/MultilineTextFieldView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-    import org.apache.royale.core.beads.TextFieldViewBase;
+    import org.apache.royale.html.beads.TextFieldViewBase;
 	import flash.text.TextFieldType;
 	
     /**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/NumericStepperView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/NumericStepperView.as
index 78af712..70aa3e2 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/NumericStepperView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/NumericStepperView.as
@@ -34,7 +34,7 @@ package org.apache.royale.html.beads
     import org.apache.royale.html.Label;
 	import org.apache.royale.html.Spinner;
 	import org.apache.royale.html.TextInput;
-	import org.apache.royale.core.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.Border;
 	
 	/**
 	 *  The NumericStepperView class creates the visual elements of the 
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/PanelView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/PanelView.as
index 502e9ba..ef48f8c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/PanelView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/PanelView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-	import org.apache.royale.core.beads.GroupView;
+	import org.apache.royale.html.beads.GroupView;
 	import org.apache.royale.core.IBeadView;
 	import org.apache.royale.core.IBeadLayout;
 	import org.apache.royale.core.ILayoutChild;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SimpleAlertView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SimpleAlertView.as
index 5cb5886..1de8ce8 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SimpleAlertView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SimpleAlertView.as
@@ -37,8 +37,8 @@ package org.apache.royale.html.beads
     import org.apache.royale.html.Label;
     import org.apache.royale.html.TextButton;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
-	import org.apache.royale.core.beads.IBackgroundBead;
-	import org.apache.royale.core.beads.IBorderBead;
+	import org.apache.royale.html.beads.IBackgroundBead;
+	import org.apache.royale.html.beads.IBorderBead;
 	
 	/**
 	 *  The SimpleAlertView class creates the visual elements of the 
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SingleLineBorderBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SingleLineBorderBead.as
index 90ee1e7..0cbf233 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SingleLineBorderBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SingleLineBorderBead.as
@@ -29,7 +29,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.utils.CSSBorderUtils;
-	import org.apache.royale.core.beads.IBorderBead;
+	import org.apache.royale.html.beads.IBorderBead;
 
     /**
      *  The SingleLineBorderBead class draws a single line solid border.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SolidBackgroundBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SolidBackgroundBead.as
index 0adc650..e7130cd 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SolidBackgroundBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SolidBackgroundBead.as
@@ -30,7 +30,7 @@ package org.apache.royale.html.beads
     import org.apache.royale.events.Event;
     import org.apache.royale.events.IEventDispatcher;
 
-    import org.apache.royale.core.beads.IBackgroundBead;
+    import org.apache.royale.html.beads.IBackgroundBead;
     
 
     /**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TableCellView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TableCellView.as
index 7b7f48b..d4784f4 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TableCellView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TableCellView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-    import org.apache.royale.core.beads.GroupView;
+    import org.apache.royale.html.beads.GroupView;
 	
 	/**
 	 *  The TableCellView class is the view bead for TableCell. It has no function
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as
index 0e1a54c..bb239e5 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextAreaView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-	import org.apache.royale.core.beads.TextFieldViewBase;
+	import org.apache.royale.html.beads.TextFieldViewBase;
 	import flash.display.DisplayObject;
 	import flash.events.Event;
 	import flash.events.IEventDispatcher;
@@ -30,7 +30,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.core.IParent;
     import org.apache.royale.core.ValuesManager;
-	import org.apache.royale.core.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.Border;
 	import org.apache.royale.html.supportClasses.VScrollBar;
 	import org.apache.royale.html.beads.models.ScrollBarModel;
 
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldView.as
index 4a558e9..a8730b9 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-    import org.apache.royale.core.beads.TextFieldViewBase;
+    import org.apache.royale.html.beads.TextFieldViewBase;
 	import flash.text.TextFieldType;
 	
     /**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputView.as
index b00b550..95350ec 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputView.as
@@ -17,7 +17,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {
-    import org.apache.royale.core.beads.TextFieldViewBase;
+    import org.apache.royale.html.beads.TextFieldViewBase;
 	import flash.display.DisplayObject;
 	import flash.text.TextFieldType;
 	
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputWithBorderView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputWithBorderView.as
index 1a5ec1a..28d6dd5 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputWithBorderView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextInputWithBorderView.as
@@ -31,7 +31,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
     import org.apache.royale.geom.Rectangle;
-	import org.apache.royale.core.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.Border;
 
     /**
      *  The TextInputWithBorderView class is the default view for
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as
index 803c60a..6fc61f2 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as
@@ -27,8 +27,8 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.IUIBase;
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.core.ValuesManager;
-	import org.apache.royale.core.beads.GroupView;
-	import org.apache.royale.core.supportClasses.Viewport;
+	import org.apache.royale.html.beads.GroupView;
+	import org.apache.royale.html.supportClasses.Viewport;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.html.Container;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataContainerView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataContainerView.as
index dcb5925..59d2ae7 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataContainerView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataContainerView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {	
-	import org.apache.royale.core.beads.views.ContainerView;
+	import org.apache.royale.html.beads.ContainerView;
 	import org.apache.royale.core.BeadViewBase;
 	import org.apache.royale.core.ContainerBase;
 	import org.apache.royale.core.IBead;
@@ -41,9 +41,9 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.ValuesManager;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.supportClasses.Border;
-	import org.apache.royale.core.supportClasses.DataGroup;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.DataGroup;
+	import org.apache.royale.html.beads.IListView;
 
 	/**
 	 *  The DataContainerView provides the visual elements for the DataContainer.
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataItemRendererFactoryForArrayData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataItemRendererFactoryForArrayData.as
index 338207a..e78e67f 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualDataItemRendererFactoryForArrayData.as
@@ -39,7 +39,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.events.ItemRendererEvent;
 	import org.apache.royale.html.List;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
 
     [Event(name="itemRendererCreated",type="org.apache.royale.events.ItemRendererEvent")]
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualListView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualListView.as
index 6fac115..5f9719e 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualListView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VirtualListView.as
@@ -41,8 +41,8 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.ValuesManager;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.supportClasses.Border;
-	import org.apache.royale.core.supportClasses.DataGroup;
+	import org.apache.royale.html.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.DataGroup;
     COMPILE::SWF {
         import org.apache.royale.geom.Size;
     }
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/DropDownListController.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/DropDownListController.as
index 062a880..a3dbefb 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/DropDownListController.as
@@ -30,7 +30,7 @@ package org.apache.royale.html.beads.controllers
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.events.MouseEvent;
-	import org.apache.royale.core.beads.IDropDownListView;
+	import org.apache.royale.html.beads.IDropDownListView;
 
     /**
      *  The DropDownListController class is the controller for
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/EditableTextKeyboardController.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/EditableTextKeyboardController.as
index 65204c3..7e07b2b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/EditableTextKeyboardController.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/EditableTextKeyboardController.as
@@ -24,7 +24,7 @@ package org.apache.royale.html.beads.controllers
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.core.ITextModel;
 	import org.apache.royale.core.UIBase;
-	import org.apache.royale.core.beads.ITextFieldView;
+	import org.apache.royale.html.beads.ITextFieldView;
 	
 	/**
 	 *  The EditableTextKeyboardController class bead intercepts keyboard events on the
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ListSingleSelectionMouseController.as
index 34d2ec0..bd8ccb0 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ListSingleSelectionMouseController.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ListSingleSelectionMouseController.as
@@ -29,7 +29,7 @@ package org.apache.royale.html.beads.controllers
 	import org.apache.royale.events.ItemAddedEvent;
 	import org.apache.royale.events.ItemRemovedEvent;
 	import org.apache.royale.events.MouseEvent;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	
 	import org.apache.royale.events.ItemClickedEvent;
 
@@ -103,7 +103,7 @@ package org.apache.royale.html.beads.controllers
          *  @productversion Royale 0.9
          *  @royaleignorecoercion org.apache.royale.core.ISelectionModel
          *  @royaleignorecoercion org.apache.royale.events.IEventDispatcher
-         *  @royaleignorecoercion org.apache.royale.core.IListView
+         *  @royaleignorecoercion org.apache.royale.html.beads.IListView
          */
 		public function set strand(value:IStrand):void
 		{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/ButtonBarLayout.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/ButtonBarLayout.as
index d152a74..80450c6 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/ButtonBarLayout.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/ButtonBarLayout.as
@@ -24,7 +24,7 @@ package org.apache.royale.html.beads.layouts
 	import org.apache.royale.core.IStyleableObject;
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.html.beads.models.ButtonBarModel;
-	import org.apache.royale.core.UIItemRendererBase;
+	import org.apache.royale.html.supportClasses.UIItemRendererBase;
 
 	/**
 	 *  The ButtonBarLayout class bead sizes and positions the button
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
index 4addfbd..94bbeef 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
@@ -36,7 +36,7 @@ package org.apache.royale.html.beads.layouts
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
     import org.apache.royale.geom.Rectangle;
-    import org.apache.royale.core.supportClasses.Viewport;
+    import org.apache.royale.html.supportClasses.Viewport;
 	import org.apache.royale.utils.CSSUtils;
 
     /**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ButtonBarModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ButtonBarModel.as
index 73cb038..c04b18e 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ButtonBarModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ButtonBarModel.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads.models
 {
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	import org.apache.royale.core.IRollOverModel;
 	import org.apache.royale.core.ISelectionModel;
 	import org.apache.royale.core.IStrand;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ComboBoxModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ComboBoxModel.as
index a64b6ad..6a9ff58 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ComboBoxModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ComboBoxModel.as
@@ -18,13 +18,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads.models
 {
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.core.IComboBoxModel;
 	import org.apache.royale.events.Event;
 			
 	/**
-	 *  The ComboBoxModel class bead extends org.apache.royale.core.beads.models.ArraySelectionModel 
+	 *  The ComboBoxModel class bead extends org.apache.royale.html.beads.models.ArraySelectionModel 
 	 *  and adds the text being displayed by the org.apache.royale.html.ComboBox's input field.
 	 *  
 	 *  @langversion 3.0
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataGridModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataGridModel.as
index a26281c..0e19788 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataGridModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataGridModel.as
@@ -18,13 +18,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads.models
 {
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	import org.apache.royale.core.IBeadModel;
 	import org.apache.royale.core.IDataGridModel;
 	import org.apache.royale.events.Event;
 
 	/**
-	 *  The DataGridModel class bead extends org.apache.royale.core.beads.models.ArraySelectionModel
+	 *  The DataGridModel class bead extends org.apache.royale.html.beads.models.ArraySelectionModel
 	 *  to facilitate using an Array as the dataProvider for the DataGrid.
 	 *
 	 *  @langversion 3.0
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MenuBarModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MenuBarModel.as
index 199381f..7a51450 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MenuBarModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MenuBarModel.as
@@ -14,7 +14,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads.models
 {
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	import org.apache.royale.events.Event;
 
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MenuModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MenuModel.as
index 0d28965..843288c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MenuModel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MenuModel.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads.models
 {
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	import org.apache.royale.core.IStrand;
 
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ButtonBarButtonItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ButtonBarButtonItemRenderer.as
index fe30c10..dadbbff 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ButtonBarButtonItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ButtonBarButtonItemRenderer.as
@@ -26,7 +26,7 @@ package org.apache.royale.html.supportClasses
 	import org.apache.royale.html.TextButton;
 	import org.apache.royale.html.beads.ITextItemRenderer;
 	import org.apache.royale.events.ItemClickedEvent;
-	import org.apache.royale.core.UIItemRendererBase;
+	import org.apache.royale.html.supportClasses.UIItemRendererBase;
 
 	/**
 	 *  The ButtonBarButtonItemRenderer class handles the display of each item for the 
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/CascadingMenuItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/CascadingMenuItemRenderer.as
index 6c34085..4af2631 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/CascadingMenuItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/CascadingMenuItemRenderer.as
@@ -22,7 +22,7 @@ package org.apache.royale.html.supportClasses
 	import org.apache.royale.html.Label;
 	import org.apache.royale.html.beads.ITextItemRenderer;
 	import org.apache.royale.svg.Rect;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.html.util.getLabelFromData;
 
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DateChooserList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DateChooserList.as
index 30fac6e..5e7bb29 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DateChooserList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DateChooserList.as
@@ -19,7 +19,7 @@
 package org.apache.royale.html.supportClasses
 {
 	import org.apache.royale.html.List;
-	import org.apache.royale.core.supportClasses.Viewport;
+	import org.apache.royale.html.supportClasses.Viewport;
 	import org.apache.royale.html.beads.layouts.TileLayout;
 	
 	public class DateChooserList extends List
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MenuBarItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MenuBarItemRenderer.as
index 654cb8d..fd8ed49 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MenuBarItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MenuBarItemRenderer.as
@@ -20,7 +20,7 @@ package org.apache.royale.html.supportClasses
 {
 	import org.apache.royale.html.Label;
 	import org.apache.royale.html.beads.ITextItemRenderer;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.html.util.getLabelFromData;
 	
 	public class MenuBarItemRenderer extends DataItemRenderer implements ITextItemRenderer
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MenuItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MenuItemRenderer.as
index 340c98b..c57b991 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MenuItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MenuItemRenderer.as
@@ -21,7 +21,7 @@ package org.apache.royale.html.supportClasses
 	import org.apache.royale.core.ISelectableItemRenderer;
 	import org.apache.royale.html.Label;
 	import org.apache.royale.html.beads.ITextItemRenderer;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.html.util.getLabelFromData;
 
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ScrollingViewport.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ScrollingViewport.as
index 99b032d..46a851c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ScrollingViewport.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ScrollingViewport.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.supportClasses
 {
-	import org.apache.royale.core.supportClasses.Viewport;
+	import org.apache.royale.html.supportClasses.Viewport;
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.core.IBeadLayout;
     import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StringItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StringItemRenderer.as
index b111354..5c6c454 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StringItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StringItemRenderer.as
@@ -32,7 +32,7 @@ package org.apache.royale.html.supportClasses
     }
     import org.apache.royale.events.Event;
     import org.apache.royale.html.beads.ITextItemRenderer;
-	import org.apache.royale.core.DataItemRenderer; 
+	import org.apache.royale.html.supportClasses.DataItemRenderer; 
 	import org.apache.royale.html.util.getLabelFromData;
 
 	/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeGridControlItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeGridControlItemRenderer.as
index a5461fc..3e01ce3 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeGridControlItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeGridControlItemRenderer.as
@@ -25,7 +25,7 @@ package org.apache.royale.html.supportClasses
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.events.ItemAddedEvent;
 	import org.apache.royale.html.TextButton;
-	import org.apache.royale.core.UIItemRendererBase;
+	import org.apache.royale.html.supportClasses.UIItemRendererBase;
 
 	public class TreeGridControlItemRenderer extends UIItemRendererBase implements IItemRendererParent
 	{
diff --git a/frameworks/projects/Charts/src/main/resources/defaults.css b/frameworks/projects/Charts/src/main/resources/defaults.css
index 1141bb9..6d44227 100644
--- a/frameworks/projects/Charts/src/main/resources/defaults.css
+++ b/frameworks/projects/Charts/src/main/resources/defaults.css
@@ -30,7 +30,7 @@ BarChart
     IItemRenderer: ClassReference("org.apache.royale.charts.supportClasses.BoxItemRenderer");
     IHorizontalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
     IVerticalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
 }
 
 BoxItemRenderer
@@ -54,7 +54,7 @@ ColumnChart
     IItemRenderer: ClassReference("org.apache.royale.charts.supportClasses.BoxItemRenderer");
     IHorizontalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
     IVerticalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
 }
 
 LineChart
@@ -69,7 +69,7 @@ LineChart
     IConnectedItemRenderer: ClassReference("org.apache.royale.charts.supportClasses.LineSegmentItemRenderer");
     IHorizontalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
     IVerticalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
 }
 
 PieChart
@@ -81,7 +81,7 @@ PieChart
     IContentView: ClassReference("org.apache.royale.charts.supportClasses.ChartDataGroup");
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.charts.beads.DataItemRendererFactoryForSeriesData");
     IItemRenderer: ClassReference("org.apache.royale.charts.supportClasses.WedgeItemRenderer");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
 }
 
 StackedColumnChart
@@ -95,7 +95,7 @@ StackedColumnChart
     IItemRenderer: ClassReference("org.apache.royale.charts.supportClasses.BoxItemRenderer");
     IHorizontalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
     IVerticalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
 }
 
 StackedBarChart
@@ -109,5 +109,5 @@ StackedBarChart
     IItemRenderer: ClassReference("org.apache.royale.charts.supportClasses.BoxItemRenderer");
     IHorizontalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
     IVerticalAxisGroup: ClassReference("org.apache.royale.charts.supportClasses.ChartAxisGroup");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
 }
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/ChartItemRendererFactory.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/ChartItemRendererFactory.as
index 79476e1..02b818f 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/ChartItemRendererFactory.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/ChartItemRendererFactory.as
@@ -29,7 +29,7 @@ package org.apache.royale.charts.beads
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	
 	/**
 	 *  The ChartItemRendererFactory class implements IDataProviderItemRendererMapper
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataItemRendererFactoryForSeriesArrayListData.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataItemRendererFactoryForSeriesArrayListData.as
index 7a023d2..084461b 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataItemRendererFactoryForSeriesArrayListData.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataItemRendererFactoryForSeriesArrayListData.as
@@ -30,7 +30,7 @@ package org.apache.royale.charts.beads
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	
 	/**
 	 *  The DataItemRendererFactoryForSeriesData creates the itemRenderers necessary for series-based
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataItemRendererFactoryForSeriesData.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataItemRendererFactoryForSeriesData.as
index 94fe54d..4c61e52 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataItemRendererFactoryForSeriesData.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataItemRendererFactoryForSeriesData.as
@@ -29,7 +29,7 @@ package org.apache.royale.charts.beads
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	
 	/**
 	 *  The DataItemRendererFactoryForSeriesData creates the itemRenderers necessary for series-based
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataTipBead.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataTipBead.as
index 8ed85f2..ee703d8 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataTipBead.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/DataTipBead.as
@@ -30,7 +30,7 @@ package org.apache.royale.charts.beads
 	import org.apache.royale.events.utils.MouseUtils;
 	import org.apache.royale.geom.Point;
 	import org.apache.royale.html.accessories.ToolTipBead;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	import org.apache.royale.utils.PointUtils;
 	
 	/**
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/HorizontalCategoryAxisBead.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/HorizontalCategoryAxisBead.as
index adb0648..c6eff69 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/HorizontalCategoryAxisBead.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/HorizontalCategoryAxisBead.as
@@ -25,7 +25,7 @@ package org.apache.royale.charts.beads
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	
 	/**
 	 *  The HorizontalCategoryAxisBead displays a horizontal axis with
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/HorizontalLinearAxisBead.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/HorizontalLinearAxisBead.as
index 6152a16..6703dc5 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/HorizontalLinearAxisBead.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/HorizontalLinearAxisBead.as
@@ -26,7 +26,7 @@ package org.apache.royale.charts.beads
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	
 	/**
 	 *  The HorizontalLinearAxisBead class provides a horizontal axis that uses a numeric
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/VerticalCategoryAxisBead.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/VerticalCategoryAxisBead.as
index d612359..426023b 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/VerticalCategoryAxisBead.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/VerticalCategoryAxisBead.as
@@ -26,7 +26,7 @@ package org.apache.royale.charts.beads
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	
 	/**
 	 *  The VerticalCategoryAxisBead displays a vertical axis with
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/VerticalLinearAxisBead.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/VerticalLinearAxisBead.as
index 8c84c59..0c7cc59 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/VerticalLinearAxisBead.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/VerticalLinearAxisBead.as
@@ -26,7 +26,7 @@ package org.apache.royale.charts.beads
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	
 	/**
 	 *  The VerticalLinearAxisBead class provides a vertical axis that uses a numeric
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/controllers/ChartSeriesMouseController.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/controllers/ChartSeriesMouseController.as
index f3c5129..43107d4 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/controllers/ChartSeriesMouseController.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/controllers/ChartSeriesMouseController.as
@@ -29,7 +29,7 @@ package org.apache.royale.charts.beads.controllers
 	import org.apache.royale.events.ItemAddedEvent;
 	import org.apache.royale.events.ItemRemovedEvent;
 	import org.apache.royale.events.MouseEvent;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 
 	import org.apache.royale.events.ItemClickedEvent;
 
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/models/ChartArraySelectionModel.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/models/ChartArraySelectionModel.as
index c42459e..962862b 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/models/ChartArraySelectionModel.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/beads/models/ChartArraySelectionModel.as
@@ -22,7 +22,7 @@ package org.apache.royale.charts.beads.models
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.EventDispatcher;
 	
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	
 	import org.apache.royale.charts.core.IChartDataModel;
 	import org.apache.royale.charts.core.IChartSeries;
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGBoxItemRenderer.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGBoxItemRenderer.as
index 114f5d6..7d76304 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGBoxItemRenderer.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGBoxItemRenderer.as
@@ -25,7 +25,7 @@ package org.apache.royale.charts.optimized
 	import org.apache.royale.graphics.IStroke;
 	import org.apache.royale.graphics.SolidColor;
 	import org.apache.royale.graphics.SolidColorStroke;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.html.supportClasses.GraphicsItemRenderer;
 	
 	/**
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGChartDataGroup.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGChartDataGroup.as
index fde30ee..a68db5d 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGChartDataGroup.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGChartDataGroup.as
@@ -29,7 +29,7 @@ package org.apache.royale.charts.optimized
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.geom.Point;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.svg.CompoundGraphic;
 	
 	/**
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGLineSegmentItemRenderer.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGLineSegmentItemRenderer.as
index 305bd9d..54c8958 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGLineSegmentItemRenderer.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGLineSegmentItemRenderer.as
@@ -23,7 +23,7 @@ package org.apache.royale.charts.optimized
 	import org.apache.royale.graphics.IStroke;
 	import org.apache.royale.svg.Path;
 	import org.apache.royale.graphics.SolidColorStroke;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.charts.supportClasses.ILineSegmentItemRenderer;
 	
 	/**
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGWedgeItemRenderer.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGWedgeItemRenderer.as
index 2707e32..1cf8257 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGWedgeItemRenderer.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/optimized/SVGWedgeItemRenderer.as
@@ -23,7 +23,7 @@ package org.apache.royale.charts.optimized
 	import org.apache.royale.graphics.IFill;
 	import org.apache.royale.graphics.IStroke;
 	import org.apache.royale.svg.Path;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.charts.supportClasses.IWedgeItemRenderer;
 	
 	/**
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/BoxItemRenderer.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/BoxItemRenderer.as
index 1ef94e7..7c37be5 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/BoxItemRenderer.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/BoxItemRenderer.as
@@ -26,7 +26,7 @@ package org.apache.royale.charts.supportClasses
 	import org.apache.royale.svg.Rect;
 	import org.apache.royale.graphics.SolidColor;
 	import org.apache.royale.svg.LinearGradient;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	
 	/**
 	 *  The BoxItemRenderer displays a colored rectangular area suitable for use as
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/ChartDataGroup.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/ChartDataGroup.as
index f52800e..f9cef89 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/ChartDataGroup.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/ChartDataGroup.as
@@ -26,8 +26,8 @@ package org.apache.royale.charts.supportClasses
 	import org.apache.royale.core.IChild;
 	import org.apache.royale.core.IUIBase;
 	import org.apache.royale.core.UIBase;
-	import org.apache.royale.core.supportClasses.DataGroup;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataGroup;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.geom.Point;
 	
 	/**
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/LineSegmentItemRenderer.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/LineSegmentItemRenderer.as
index f9430e5..7bb5bc3 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/LineSegmentItemRenderer.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/LineSegmentItemRenderer.as
@@ -21,7 +21,7 @@ package org.apache.royale.charts.supportClasses
 	import org.apache.royale.charts.core.IChartSeries;
 	import org.apache.royale.graphics.IStroke;
 	import org.apache.royale.svg.Path;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	
 	/**
 	 *  The LineSegmentItemRenderer class draws a line between the vertices of a LineSeries. 
diff --git a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/WedgeItemRenderer.as b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/WedgeItemRenderer.as
index 0fb159c..f763c31 100644
--- a/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/WedgeItemRenderer.as
+++ b/frameworks/projects/Charts/src/main/royale/org/apache/royale/charts/supportClasses/WedgeItemRenderer.as
@@ -25,7 +25,7 @@ package org.apache.royale.charts.supportClasses
 	import org.apache.royale.svg.Path;
 	import org.apache.royale.graphics.SolidColor;
 	import org.apache.royale.svg.LinearGradient;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	
 	/**
 	 *  The WedgeItemRenderer draws a single slide of a PieSeries. 
diff --git a/frameworks/projects/Core/src/main/resources/basic-manifest.xml b/frameworks/projects/Core/src/main/resources/basic-manifest.xml
index 9c4a6a4..2243cea 100644
--- a/frameworks/projects/Core/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Core/src/main/resources/basic-manifest.xml
@@ -50,17 +50,17 @@
     
     <component id="StyleChangeNotifier" class="org.apache.royale.core.StyleChangeNotifier"/>
     
-    <component id="DataItemRenderer" class="org.apache.royale.core.DataItemRenderer"/>
-    <component id="MXMLItemRenderer" class="org.apache.royale.core.MXMLItemRenderer"/>
+    <component id="DataItemRenderer" class="org.apache.royale.html.supportClasses.DataItemRenderer"/>
+    <component id="MXMLItemRenderer" class="org.apache.royale.html.supportClasses.MXMLItemRenderer"/>
 
-    <component id="MXMLBeadView" class="org.apache.royale.core.MXMLBeadView"/>
-    <component id="LayoutChangeNotifier" class="org.apache.royale.core.beads.layouts.LayoutChangeNotifier"/>
+    <component id="MXMLBeadView" class="org.apache.royale.html.MXMLBeadView"/>
+    <component id="LayoutChangeNotifier" class="org.apache.royale.html.beads.layouts.LayoutChangeNotifier"/>
     
     <component id="Group" class="org.apache.royale.html.Group"/>
-    <component id="Viewport" class="org.apache.royale.core.supportClasses.Viewport" />
-    <component id="Border" class="org.apache.royale.core.supportClasses.Border"/>
+    <component id="Viewport" class="org.apache.royale.html.supportClasses.Viewport" />
+    <component id="Border" class="org.apache.royale.html.supportClasses.Border"/>
 
-    <component id="ArraySelectionModel" class="org.apache.royale.core.beads.models.ArraySelectionModel" />
+    <component id="ArraySelectionModel" class="org.apache.royale.html.beads.models.ArraySelectionModel" />
     
     <component id="State" class="org.apache.royale.states.State"/>
 </componentPackage>
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index 3e74bcf..3b95f7f 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -39,33 +39,34 @@ internal class CoreClasses
 	import org.apache.royale.core.ContainerBaseStrandChildren; ContainerBaseStrandChildren;
 	import org.apache.royale.core.ApplicationBase; ApplicationBase;
 	import org.apache.royale.core.DataContainerBase; DataContainerBase;
-	import org.apache.royale.core.UIItemRendererBase; UIItemRendererBase;
-	import org.apache.royale.core.DataItemRenderer; DataItemRenderer;
-	import org.apache.royale.core.MXMLItemRenderer; MXMLItemRenderer;
+	import org.apache.royale.html.supportClasses.UIItemRendererBase; UIItemRendererBase;
+	import org.apache.royale.html.supportClasses.DataItemRenderer; DataItemRenderer;
+	import org.apache.royale.html.supportClasses.MXMLItemRenderer; MXMLItemRenderer;
 	import org.apache.royale.core.IList; IList;
 	import org.apache.royale.core.IIcon; IIcon;
 	import org.apache.royale.core.IIconSupport; IIconSupport;
-	import org.apache.royale.core.IListView; IListView;
+	import org.apache.royale.html.beads.IListView; IListView;
 	import org.apache.royale.events.ItemAddedEvent; ItemAddedEvent;
 	import org.apache.royale.events.ItemRemovedEvent; ItemRemovedEvent;
-	import org.apache.royale.core.beads.IDropDownListView; IDropDownListView;
+	import org.apache.royale.html.beads.IDropDownListView; IDropDownListView;
 
 	import org.apache.royale.events.ItemAddedEvent; ItemAddedEvent;
 	import org.apache.royale.events.ItemClickedEvent; ItemClickedEvent;
 	import org.apache.royale.events.ItemRemovedEvent; ItemRemovedEvent;
 	import org.apache.royale.events.ItemRendererEvent; ItemRendererEvent;
 
-    import org.apache.royale.core.MXMLBeadView; MXMLBeadView;
-    import org.apache.royale.core.beads.GroupView; GroupView;
-	import org.apache.royale.core.beads.views.ContainerView; ContainerView;
-	import org.apache.royale.core.beads.views.DataContainerView; DataContainerView;
-	import org.apache.royale.core.beads.IBackgroundBead; IBackgroundBead;
-	import org.apache.royale.core.beads.IBorderBead; IBorderBead;
+    import org.apache.royale.html.MXMLBeadView; MXMLBeadView;
+    import org.apache.royale.html.beads.GroupView; GroupView;
+	import org.apache.royale.html.beads.ContainerView; ContainerView;
+	import org.apache.royale.html.beads.DataContainerView; DataContainerView;
+	import org.apache.royale.html.beads.IBackgroundBead; IBackgroundBead;
+	import org.apache.royale.html.beads.IBorderBead; IBorderBead;
 
-	import org.apache.royale.core.supportClasses.DataGroup; DataGroup;
-	import org.apache.royale.core.supportClasses.Viewport; Viewport;
+	import org.apache.royale.html.supportClasses.DataGroup; DataGroup;
+	import org.apache.royale.html.supportClasses.Border; Border;
+	import org.apache.royale.html.supportClasses.Viewport; Viewport;
 
-	import org.apache.royale.core.beads.models.ViewportModel; ViewportModel;
+	import org.apache.royale.html.beads.models.ViewportModel; ViewportModel;
 
     import org.apache.royale.core.BeadViewBase; BeadViewBase;
     import org.apache.royale.core.ImageViewBase; ImageViewBase;
@@ -76,10 +77,10 @@ internal class CoreClasses
 	COMPILE::SWF
 	{
 		import org.apache.royale.core.UIButtonBase; UIButtonBase;
-		import org.apache.royale.core.supportClasses.ContainerContentArea; ContainerContentArea;
+		import org.apache.royale.html.supportClasses.ContainerContentArea; ContainerContentArea;
 		import org.apache.royale.core.CSSTextField; CSSTextField;
-		import org.apache.royale.core.beads.ITextFieldView; ITextFieldView;
-		import org.apache.royale.core.beads.TextFieldViewBase; TextFieldViewBase;
+		import org.apache.royale.html.beads.ITextFieldView; ITextFieldView;
+		import org.apache.royale.html.beads.TextFieldViewBase; TextFieldViewBase;
 		// import Promise; Promise;
 		import org.apache.royale.core.ApplicationFactory; ApplicationFactory;
 		import org.apache.royale.core.CSSShape; CSSShape;
@@ -163,7 +164,7 @@ internal class CoreClasses
 	import org.apache.royale.core.IViewportModel; IViewportModel;
 
 	import org.apache.royale.core.IApplicationView; IApplicationView;
-	import org.apache.royale.core.beads.models.ArraySelectionModel; ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel; ArraySelectionModel;
 
 	COMPILE::SWF
 	{
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataContainerBase.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataContainerBase.as
index f7ae26f..c2ee3a6 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataContainerBase.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataContainerBase.as
@@ -19,11 +19,11 @@
 package org.apache.royale.core
 {
 	import org.apache.royale.core.ValuesManager;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.ItemAddedEvent;
 	import org.apache.royale.events.ItemRemovedEvent;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
 	
 	/**
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
index 73440f1..baa300d 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
@@ -20,6 +20,7 @@ package org.apache.royale.core
 {
     import org.apache.royale.utils.ClassSelectorList;
     import org.apache.royale.utils.IClassSelectorListSupport;
+    import org.apache.royale.html.supportClasses.MXMLItemRenderer;
 	
 	/**
 	 *  The StyledMXMLItemRenderer class is the base class for itemRenderers that are MXML-based
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/MXMLBeadView.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/MXMLBeadView.as
similarity index 99%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/MXMLBeadView.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/MXMLBeadView.as
index 8e44302..ef371a7 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/MXMLBeadView.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/MXMLBeadView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core
+package org.apache.royale.html
 {
 	import org.apache.royale.states.State;
 
@@ -26,7 +26,7 @@ package org.apache.royale.core
 	import org.apache.royale.core.IStrand;
     import org.apache.royale.core.IStatesImpl;
 	import org.apache.royale.core.ValuesManager;
-    import org.apache.royale.core.beads.GroupView;
+    import org.apache.royale.html.beads.GroupView;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.ValueChangeEvent;
 	import org.apache.royale.utils.MXMLDataInterpreter;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/ContainerView.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ContainerView.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/ContainerView.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ContainerView.as
index 44544ed..8bf7bd3 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/ContainerView.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ContainerView.as
@@ -16,9 +16,9 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads.views
+package org.apache.royale.html.beads
 {
-	import org.apache.royale.core.beads.GroupView;
+	import org.apache.royale.html.beads.GroupView;
 	import org.apache.royale.core.ContainerBase;
 	import org.apache.royale.core.IBead;
     import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
@@ -35,9 +35,9 @@ package org.apache.royale.core.beads.views
 	import org.apache.royale.core.ValuesManager;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.geom.Size;
-	import org.apache.royale.core.beads.models.ViewportModel;
-	import org.apache.royale.core.supportClasses.Border;
-	import org.apache.royale.core.supportClasses.Viewport;
+	import org.apache.royale.html.beads.models.ViewportModel;
+	import org.apache.royale.html.supportClasses.Border;
+	import org.apache.royale.html.supportClasses.Viewport;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
 
 	/**
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/DataContainerView.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/DataContainerView.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
index 76f020c..afc4042 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/views/DataContainerView.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads.views
+package org.apache.royale.html.beads
 {	
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.core.IDataProviderModel;
@@ -28,8 +28,8 @@ package org.apache.royale.core.beads.views
 	import org.apache.royale.core.IUIBase;
 	import org.apache.royale.core.Strand;
 	import org.apache.royale.core.UIBase;
-	import org.apache.royale.core.supportClasses.DataGroup;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.supportClasses.DataGroup;
+	import org.apache.royale.html.beads.IListView;
 	import org.apache.royale.events.Event;
 
 	/**
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/GroupView.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/GroupView.as
similarity index 99%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/GroupView.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/GroupView.as
index 26588b1..ea47e0d 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/GroupView.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/GroupView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads
+package org.apache.royale.html.beads
 {
 	import org.apache.royale.core.BeadViewBase;
 	import org.apache.royale.core.IBead;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IBackgroundBead.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IBackgroundBead.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IBackgroundBead.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IBackgroundBead.as
index d4be7d8..aace652 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IBackgroundBead.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IBackgroundBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads
+package org.apache.royale.html.beads
 {
 	import org.apache.royale.core.IBead;
 
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IBorderBead.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IBorderBead.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IBorderBead.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IBorderBead.as
index b2b4639..5ece4bc 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IBorderBead.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IBorderBead.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads
+package org.apache.royale.html.beads
 {
 	import org.apache.royale.core.IBead;
 
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IDropDownListView.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IDropDownListView.as
similarity index 98%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IDropDownListView.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IDropDownListView.as
index 599abbd..9222dc6 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/IDropDownListView.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IDropDownListView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads
+package org.apache.royale.html.beads
 {
     import org.apache.royale.core.IBeadView;
     import org.apache.royale.core.IStrand;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListView.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IListView.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListView.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IListView.as
index a9a5e37..4d70538 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListView.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/IListView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core
+package org.apache.royale.html.beads
 {	
 	import org.apache.royale.core.IBeadView;
 	import org.apache.royale.core.IItemRendererParent;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/ITextFieldView.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ITextFieldView.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/ITextFieldView.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ITextFieldView.as
index 89e42fe..825a3ef 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/ITextFieldView.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ITextFieldView.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads
+package org.apache.royale.html.beads
 {
     COMPILE::SWF
     {
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/TextFieldViewBase.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
similarity index 99%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/TextFieldViewBase.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
index e28cae9..5cd9442 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/TextFieldViewBase.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads
+package org.apache.royale.html.beads
 {
 	import flash.display.DisplayObject;
 	import flash.display.DisplayObjectContainer;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/layouts/LayoutChangeNotifier.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/layouts/LayoutChangeNotifier.as
similarity index 98%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/layouts/LayoutChangeNotifier.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/layouts/LayoutChangeNotifier.as
index 00d6607..bc5d3ae 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/layouts/LayoutChangeNotifier.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/layouts/LayoutChangeNotifier.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads.layouts
+package org.apache.royale.html.beads.layouts
 {	
 	import org.apache.royale.core.IBead;
     import org.apache.royale.core.IBeadView;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/models/ArraySelectionModel.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
similarity index 99%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/models/ArraySelectionModel.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
index 1693346..ad5a1f6 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/models/ArraySelectionModel.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads.models
+package org.apache.royale.html.beads.models
 {
 	import org.apache.royale.core.IRollOverModel;
 	import org.apache.royale.core.ISelectionModel;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/models/ViewportModel.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ViewportModel.as
similarity index 98%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/models/ViewportModel.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ViewportModel.as
index ad0876d..8420fd9 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/models/ViewportModel.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ViewportModel.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads.models
+package org.apache.royale.html.beads.models
 {
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.core.IUIBase;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/Border.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Border.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/Border.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Border.as
index 9ef021f..1bdce83 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/Border.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Border.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.supportClasses
+package org.apache.royale.html.supportClasses
 {
 	import org.apache.royale.core.UIBase;
 	
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/ContainerContentArea.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/ContainerContentArea.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/ContainerContentArea.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/ContainerContentArea.as
index 1d934b7..7dcb4f2 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/ContainerContentArea.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/ContainerContentArea.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.supportClasses
+package org.apache.royale.html.supportClasses
 {
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.core.IStrand;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/DataGroup.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
similarity index 97%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/DataGroup.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
index 878955d..c72ce93 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/DataGroup.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.supportClasses
+package org.apache.royale.html.supportClasses
 {	
     import org.apache.royale.core.IChild;
     import org.apache.royale.core.IItemRenderer;
@@ -25,7 +25,7 @@ package org.apache.royale.core.supportClasses
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.ItemAddedEvent;
 	import org.apache.royale.events.ItemRemovedEvent;
-	import org.apache.royale.core.DataItemRenderer;
+	import org.apache.royale.html.supportClasses.DataItemRenderer;
 
     /**
      *  The DataGroup class is the IItemRendererParent used internally
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataItemRenderer.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
similarity index 98%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataItemRenderer.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
index a69d366..8e66c2e 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataItemRenderer.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core
+package org.apache.royale.html.supportClasses
 {
 	COMPILE::SWF
 	{
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/MXMLItemRenderer.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
similarity index 98%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/MXMLItemRenderer.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
index 2e33d88..d4748f3 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/MXMLItemRenderer.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core
+package org.apache.royale.html.supportClasses
 {
 	import org.apache.royale.core.ILayoutHost;
 	import org.apache.royale.core.ILayoutParent;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIItemRendererBase.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
similarity index 99%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIItemRendererBase.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
index 53fd43f..291596a 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIItemRendererBase.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core
+package org.apache.royale.html.supportClasses
 {
 	import org.apache.royale.core.ISelectableItemRenderer;
 	import org.apache.royale.core.UIBase;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/Viewport.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
similarity index 99%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/Viewport.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
index eaa601a..8fe96d6 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/Viewport.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.supportClasses
+package org.apache.royale.html.supportClasses
 {
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.core.IContentView;
diff --git a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/beads/EasyAccordionCollapseBead.as b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/beads/EasyAccordionCollapseBead.as
index 9da70ad..87fbf4c 100644
--- a/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/beads/EasyAccordionCollapseBead.as
+++ b/frameworks/projects/Effects/src/main/royale/org/apache/royale/effects/beads/EasyAccordionCollapseBead.as
@@ -24,7 +24,7 @@ package org.apache.royale.effects.beads
 	import org.apache.royale.core.UIBase;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.html.beads.AccordionCollapseBead;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	import org.apache.royale.html.supportClasses.ICollapsible;
 	import org.apache.royale.utils.AbsoluteLayoutTweener;
 	
diff --git a/frameworks/projects/Express/src/main/resources/defaults.css b/frameworks/projects/Express/src/main/resources/defaults.css
index 5b3f9c6..a0e3ae1 100644
--- a/frameworks/projects/Express/src/main/resources/defaults.css
+++ b/frameworks/projects/Express/src/main/resources/defaults.css
@@ -60,8 +60,8 @@ DataGrid
 	IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	border-style: none;
 	background-color: #FFFFFF;
 }
@@ -73,10 +73,10 @@ DataGrid
 
 Container
 {	
-	IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.BasicLayout");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	
 	background-color: #FFFFFF;
 }
@@ -116,7 +116,7 @@ TextInput
 
 View
 {
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.BasicLayout");
 }
 
diff --git a/frameworks/projects/Express/src/main/royale/org/apache/royale/express/List.as b/frameworks/projects/Express/src/main/royale/org/apache/royale/express/List.as
index 0818b8e..98c89ae 100644
--- a/frameworks/projects/Express/src/main/royale/org/apache/royale/express/List.as
+++ b/frameworks/projects/Express/src/main/royale/org/apache/royale/express/List.as
@@ -22,7 +22,7 @@ package org.apache.royale.express
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.html.List;
-	import org.apache.royale.core.beads.models.ArraySelectionModel;
+	import org.apache.royale.html.beads.models.ArraySelectionModel;
 	import org.apache.royale.html.beads.DataItemRendererFactoryForArrayData;
 	import org.apache.royale.html.beads.DataItemRendererFactoryForArrayList;
 	import org.apache.royale.html.beads.models.ArrayListSelectionModel;
diff --git a/frameworks/projects/Express/src/main/royale/org/apache/royale/express/MXMLItemRenderer.as b/frameworks/projects/Express/src/main/royale/org/apache/royale/express/MXMLItemRenderer.as
index 1bd18e9..e00c05b 100644
--- a/frameworks/projects/Express/src/main/royale/org/apache/royale/express/MXMLItemRenderer.as
+++ b/frameworks/projects/Express/src/main/royale/org/apache/royale/express/MXMLItemRenderer.as
@@ -19,13 +19,13 @@
 package org.apache.royale.express
 {
 	import org.apache.royale.binding.ItemRendererDataBinding;
-	import org.apache.royale.core.MXMLItemRenderer;
+	import org.apache.royale.html.supportClasses.MXMLItemRenderer;
 	
 	/**
 	 * This class extends MXMLItemRenderer and adds ItemRendererDataBinding
 	 * for convenience.
 	 */
-	public class MXMLItemRenderer extends org.apache.royale.core.MXMLItemRenderer
+	public class MXMLItemRenderer extends org.apache.royale.html.supportClasses.MXMLItemRenderer
 	{
 		public function MXMLItemRenderer()
 		{
diff --git a/frameworks/projects/Flat/src/main/resources/defaults.css b/frameworks/projects/Flat/src/main/resources/defaults.css
index beb9840..6f557ae 100644
--- a/frameworks/projects/Flat/src/main/resources/defaults.css
+++ b/frameworks/projects/Flat/src/main/resources/defaults.css
@@ -75,11 +75,11 @@ Button:active
 
 ButtonBar
 {
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IBeadView:  ClassReference("org.apache.royale.html.beads.ButtonBarView");			
     IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");
     IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.ButtonBarLayout");
-    IDataGroup: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+    IDataGroup: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
     IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.ButtonBarButtonItemRenderer");
@@ -172,15 +172,15 @@ CheckBox
 
 Container
 {
-    IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
+    IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
     IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.BasicLayout");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 }
 
 ControlBar
 {
-	IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
 	
     background-color: #CECECE;
@@ -192,13 +192,13 @@ ControlBar
 DataContainer
 {
 	IBeadModel: ClassReference("org.apache.royale.html.beads.models.DataProviderModel");
-	IBeadView:  ClassReference("org.apache.royale.core.beads.views.DataContainerView");			
+	IBeadView:  ClassReference("org.apache.royale.html.beads.DataContainerView");			
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
 	IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 	border-style: solid;
 	border-color: #222222;
 }
@@ -316,7 +316,7 @@ DateField {
   
 HContainer
 {
-    IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
+    IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
     IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.HorizontalLayout");
 }
 
@@ -327,17 +327,17 @@ ImageButton
 
 VContainer
 {
-    IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
+    IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
     IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
 }
 
 List
 {
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IBeadView:  ClassReference("org.apache.royale.html.beads.ListView");			
     IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");
     IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
-    IDataGroup: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+    IDataGroup: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
     IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
@@ -451,11 +451,11 @@ RadioButton
 
 SimpleList
 {
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IBeadView:  ClassReference("org.apache.royale.html.beads.ListView");
     IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");
     IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.VerticalLayout");
-    IDataGroup: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+    IDataGroup: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
     IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
@@ -514,7 +514,7 @@ ToolTip
 
 View
 {
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
     IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.BasicLayout");
 }
 
@@ -595,12 +595,12 @@ ControlBar
 DataContainer {
 	IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
 	IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
-	IContentView: ClassReference("org.apache.royale.core.supportClasses.DataGroup");
+	IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
 }
 
 DropDownList
 {
-	IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+	IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
 	IBeadView: ClassReference("org.apache.royale.flat.beads.DropDownListView");
 	IBeadController: ClassReference("org.apache.royale.html.beads.controllers.DropDownListController");
     IPopUp: ClassReference("org.apache.royale.flat.supportClasses.DropDownListList");
@@ -609,7 +609,7 @@ DropDownList
 
 DropDownListList
 {
-	IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+	IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
 	IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.TextItemRendererFactoryForArrayData");
 	IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
 	IItemRenderer: ClassReference("org.apache.royale.flat.supportClasses.DropDownListStringItemRenderer");
diff --git a/frameworks/projects/Flat/src/main/royale/org/apache/royale/flat/DropDownList.as b/frameworks/projects/Flat/src/main/royale/org/apache/royale/flat/DropDownList.as
index 76f6840..57df23a 100644
--- a/frameworks/projects/Flat/src/main/royale/org/apache/royale/flat/DropDownList.as
+++ b/frameworks/projects/Flat/src/main/royale/org/apache/royale/flat/DropDownList.as
@@ -32,7 +32,7 @@ package org.apache.royale.flat
         import org.apache.royale.core.WrappedHTMLElement;
         import org.apache.royale.core.ISelectionModel;
         import org.apache.royale.events.Event;
-        import org.apache.royale.core.beads.models.ArraySelectionModel;
+        import org.apache.royale.html.beads.models.ArraySelectionModel;
         import org.apache.royale.utils.CSSUtils;
     }
     
diff --git a/frameworks/projects/Flat/src/main/royale/org/apache/royale/flat/beads/DropDownListView.as b/frameworks/projects/Flat/src/main/royale/org/apache/royale/flat/beads/DropDownListView.as
index bc171ac..d970d28 100644
--- a/frameworks/projects/Flat/src/main/royale/org/apache/royale/flat/beads/DropDownListView.as
+++ b/frameworks/projects/Flat/src/main/royale/org/apache/royale/flat/beads/DropDownListView.as
@@ -41,7 +41,7 @@ package org.apache.royale.flat.beads
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.html.Button;
-	import org.apache.royale.core.beads.IDropDownListView;
+	import org.apache.royale.html.beads.IDropDownListView;
 	import org.apache.royale.utils.CSSUtils;
     import org.apache.royale.utils.UIUtils;
     
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 03cc865..08bdc84 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -37,12 +37,12 @@ button, input, textarea {
 }
 
 j|View {
-  IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+  IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
   IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout");
 }
 
 j|ApplicationResponsiveView {
-  IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+  IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
 }
 
 .applicationResponsiveView {
@@ -51,12 +51,12 @@ j|ApplicationResponsiveView {
 }
 
 j|ApplicationView {
-  IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+  IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
   IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout");
 }
 
 j|Group {
-  IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+  IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
 }
 
 j|HGroup {
@@ -68,9 +68,9 @@ j|VGroup {
 }
 
 j|Container {
-  IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
-  IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-  IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+  IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
+  IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+  IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 }
 
 j|Image {
@@ -220,7 +220,7 @@ j|Card {
 }
 
 j|ControlBar {
-  IBeadView: ClassReference("org.apache.royale.core.beads.GroupView");
+  IBeadView: ClassReference("org.apache.royale.html.beads.GroupView");
   IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout");
 }
 
@@ -327,14 +327,14 @@ j|ControlBar {
 
 @media -royale-swf {
   j|DropDownList {
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IBeadView: ClassReference("org.apache.royale.jewel.beads.views.DropDownListView");
     IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.DropDownListController");
     IPopUp: ClassReference("org.apache.royale.jewel.supportClasses.DropDownListList");
   }
 
   j|DropDownListList {
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
   }
 }
@@ -2516,7 +2516,7 @@ j|List {
   IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
   IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.ListItemRenderer");
   IViewport: ClassReference("org.apache.royale.jewel.supportClasses.ScrollingViewport");
-  IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+  IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
   IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel");
   IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.DataItemRendererFactoryForCollectionView");
 }
@@ -2528,7 +2528,7 @@ j|Navigation {
   IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
   IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.NavigationLinkItemRenderer");
   IViewport: ClassReference("org.apache.royale.jewel.supportClasses.ScrollingViewport");
-  IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+  IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
   IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel");
   IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.DataItemRendererFactoryForCollectionView");
 }
@@ -2871,9 +2871,9 @@ j|TitleBar {
 }
 
 j|ApplicationMainContent {
-  IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView");
-  IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport");
-  IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel");
+  IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView");
+  IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
+  IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
 }
 
 /*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DropDownList.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DropDownList.as
index 5091738..e529c6e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DropDownList.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DropDownList.as
@@ -24,7 +24,7 @@ package org.apache.royale.jewel
     {
         import goog.events;
         import org.apache.royale.core.WrappedHTMLElement;
-        import org.apache.royale.core.beads.models.ArraySelectionModel;
+        import org.apache.royale.html.beads.models.ArraySelectionModel;
         import org.apache.royale.html.util.addElementToWrapper;
     }
 
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/DataItemRendererFactoryForCollectionView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/DataItemRendererFactoryForCollectionView.as
index af9e3fd..f7e5c01 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/DataItemRendererFactoryForCollectionView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/DataItemRendererFactoryForCollectionView.as
@@ -34,9 +34,9 @@ package org.apache.royale.jewel.beads
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.EventDispatcher;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.core.UIItemRendererBase;
+	import org.apache.royale.html.supportClasses.UIItemRendererBase;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 
 	
 	/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DropDownListController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DropDownListController.as
index 01b41eb..8729379 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DropDownListController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DropDownListController.as
@@ -30,7 +30,7 @@ package org.apache.royale.jewel.beads.controllers
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.events.MouseEvent;
-	import org.apache.royale.core.beads.IDropDownListView;
+	import org.apache.royale.html.beads.IDropDownListView;
 
     /**
      *  The DropDownListController class is the controller for
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as
index d2b5a9f..cddfdbf 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as
@@ -29,7 +29,7 @@ package org.apache.royale.jewel.beads.controllers
 	import org.apache.royale.events.ItemAddedEvent;
 	import org.apache.royale.events.ItemRemovedEvent;
 	import org.apache.royale.events.MouseEvent;
-	import org.apache.royale.core.IListView;
+	import org.apache.royale.html.beads.IListView;
 	
 	import org.apache.royale.events.ItemClickedEvent;
 
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/PasswordInput.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/PasswordInput.as
index 0a6dde5..b1c2a9e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/PasswordInput.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/PasswordInput.as
@@ -21,7 +21,7 @@ package org.apache.royale.jewel.beads.controls.textinput
 	COMPILE::SWF
 	{
 		import org.apache.royale.core.CSSTextField;			
-		import org.apache.royale.core.beads.ITextFieldView;
+		import org.apache.royale.html.beads.ITextFieldView;
 	}
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.core.IStrand;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
index 2a1bb22..6030560 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-    import org.apache.royale.core.beads.GroupView;
+    import org.apache.royale.html.beads.GroupView;
     import org.apache.royale.core.IAlertModel;
     import org.apache.royale.core.IBead;
     import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
@@ -43,8 +43,8 @@ package org.apache.royale.jewel.beads.views
 	
     COMPILE::SWF
 	{
-        import org.apache.royale.core.beads.IBackgroundBead;
-        import org.apache.royale.core.beads.IBorderBead;
+        import org.apache.royale.html.beads.IBackgroundBead;
+        import org.apache.royale.html.beads.IBorderBead;
         import org.apache.royale.core.IMeasurementBead;
         import org.apache.royale.core.ValuesManager;
         import org.apache.royale.utils.loadBeadFromValuesManager;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DropDownListView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DropDownListView.as
index 1a810d7..2582856 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DropDownListView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DropDownListView.as
@@ -38,7 +38,7 @@ package org.apache.royale.jewel.beads.views
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.utils.SolidBorderUtil;
 	import org.apache.royale.utils.UIUtils;
-    import org.apache.royale.core.beads.IDropDownListView;
+    import org.apache.royale.html.beads.IDropDownListView;
     
     /**
      *  The DropDownListView class is the default view for
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
index b484ef1..16a59c4 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-	import org.apache.royale.core.beads.views.DataContainerView;
+	import org.apache.royale.html.beads.DataContainerView;
 	import org.apache.royale.core.IBead;
 	import org.apache.royale.core.IRollOverModel;
 	import org.apache.royale.core.ISelectableItemRenderer;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
index 3208904..f0506fd 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TextFieldView.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
-    import org.apache.royale.core.beads.TextFieldViewBase
+    import org.apache.royale.html.beads.TextFieldViewBase
 	import flash.text.TextFieldType;
 	
     /**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/ScrollingViewport.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/ScrollingViewport.as
index 6c6b6b2..38db33d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/ScrollingViewport.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/ScrollingViewport.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.supportClasses
 {
-	import org.apache.royale.core.supportClasses.Viewport;
+	import org.apache.royale.html.supportClasses.Viewport;
 	import org.apache.royale.core.IBead;
     import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
 	import org.apache.royale.core.IContainer;
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index a9a7801..5c981d0 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -39,11 +39,11 @@ button, input, textarea
 	font-size: 100%
 
 j|View
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView")
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView")
 	IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout")
 
 j|ApplicationResponsiveView
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView")
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView")
 	//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout")
 
 .applicationResponsiveView
@@ -52,7 +52,7 @@ j|ApplicationResponsiveView
 	// height: 100% // can't have 100% height or prevents app scrolling
 
 j|ApplicationView
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView")
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView")
 	IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
 	// IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout")
 
@@ -67,7 +67,7 @@ j|ApplicationView
 // 	-webkit-overflow-scrolling: touch
 
 j|Group
-	IBeadView: ClassReference("org.apache.royale.core.beads.GroupView")
+	IBeadView: ClassReference("org.apache.royale.html.beads.GroupView")
 
 j|HGroup
 	IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
@@ -76,10 +76,10 @@ j|VGroup
 	IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
 
 j|Container
-	IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView")
+	IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView")
 	//IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout")
-	IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport")
-	IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel")
+	IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport")
+	IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
 	//align-items: flex-start
 
 j|Image
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_applicationmaincontent.sass b/frameworks/projects/Jewel/src/main/sass/components/_applicationmaincontent.sass
index 985f826..fd80971 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_applicationmaincontent.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_applicationmaincontent.sass
@@ -38,7 +38,7 @@
     padding-top: $top-app-bar-row-height !important
 
 j|ApplicationMainContent
-    IBeadView: ClassReference("org.apache.royale.core.beads.views.ContainerView")
+    IBeadView: ClassReference("org.apache.royale.html.beads.ContainerView")
     //IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout") // Basic layoutr doesn't work here
-    IViewport: ClassReference("org.apache.royale.core.supportClasses.Viewport")
-    IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel")
\ No newline at end of file
+    IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport")
+    IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_controlbar.sass b/frameworks/projects/Jewel/src/main/sass/components/_controlbar.sass
index 8777e0c..416eea4 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_controlbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_controlbar.sass
@@ -23,7 +23,7 @@
     min-height: 34px
 
 j|ControlBar
-    IBeadView: ClassReference("org.apache.royale.core.beads.GroupView")
+    IBeadView: ClassReference("org.apache.royale.html.beads.GroupView")
     IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
 
 @media -royale-swf
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_dropdownlist.sass b/frameworks/projects/Jewel/src/main/sass/components/_dropdownlist.sass
index 4192c01..b7d955d 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_dropdownlist.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_dropdownlist.sass
@@ -23,7 +23,7 @@
 
 @media -royale-swf	
     j|DropDownList
-        IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel")
+        IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel")
         IBeadView: ClassReference("org.apache.royale.jewel.beads.views.DropDownListView")
         IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.DropDownListController")
         IPopUp: ClassReference("org.apache.royale.jewel.supportClasses.DropDownListList")
@@ -31,7 +31,7 @@
         // font-family: Arial
 
     j|DropDownListList
-        IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel")
+        IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel")
         //--- IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.TextItemRendererFactoryForArrayData")
         IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory")
         //--- IItemRenderer: ClassReference("org.apache.royale.core.supportClasses.StringItemRenderer")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
index 0655a71..17ae2f2 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
@@ -31,10 +31,10 @@ j|List
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory")
     IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.ListItemRenderer")
     IViewport: ClassReference("org.apache.royale.jewel.supportClasses.ScrollingViewport")
-    IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel")
+    IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
     IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel")
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.DataItemRendererFactoryForCollectionView")
-    //IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel")
+    //IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel")
     //IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData")
 
 
@@ -45,7 +45,7 @@ j|Navigation
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory")
     IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.NavigationLinkItemRenderer")
     IViewport: ClassReference("org.apache.royale.jewel.supportClasses.ScrollingViewport")
-    IViewportModel: ClassReference("org.apache.royale.core.beads.models.ViewportModel")
+    IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
     IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel")
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.DataItemRendererFactoryForCollectionView")
     // IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData")
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 77855e2..8f12f62 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -61,7 +61,7 @@ import org.apache.royale.events.KeyboardEvent;
 import org.apache.royale.events.ValueChangeEvent;
 import org.apache.royale.geom.Point;
 import org.apache.royale.geom.Rectangle;
-import org.apache.royale.core.supportClasses.ContainerContentArea;
+import org.apache.royale.html.supportClasses.ContainerContentArea;
 import org.apache.royale.utils.PointUtils;
 import org.apache.royale.utils.loadBeadFromValuesManager;
 
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/skins/Border.as b/frameworks/projects/MXRoyale/src/main/royale/mx/skins/Border.as
index aa1857d..4983254 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/skins/Border.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/skins/Border.as
@@ -21,7 +21,7 @@ package mx.skins
 {
 
 import mx.core.EdgeMetrics;
-import org.apache.royale.core.supportClasses.Border;
+import org.apache.royale.html.supportClasses.Border;
 
 /**
  *  The Border class is an abstract base class for various classes that
@@ -39,7 +39,7 @@ import org.apache.royale.core.supportClasses.Border;
  *  @playerversion AIR 1.1
  *  @productversion Royale 0.9.3
  */
-public class Border extends org.apache.royale.core.supportClasses.Border 
+public class Border extends org.apache.royale.html.supportClasses.Border 
 {
 	//include "../core/Version.as";
 
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 33be588..db5bf35 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -75,7 +75,7 @@ Slider
 List
 {
     IBeadView: ClassReference("org.apache.royale.mdl.beads.views.ListView");
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IBeadLayout: ClassReference(null); /*"org.apache.royale.html.beads.layouts.VerticalLayout"*/
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
@@ -85,7 +85,7 @@ List
 Table
 {
     IBeadView: ClassReference("org.apache.royale.mdl.beads.views.TableView");
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IBeadLayout: ClassReference(null); /*"org.apache.royale.html.beads.layouts.VerticalLayout"*/
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
@@ -95,7 +95,7 @@ Table
 Navigation
 {
     IBeadView: ClassReference("org.apache.royale.mdl.beads.views.ListView");
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IBeadLayout: ClassReference(null); /*"org.apache.royale.html.beads.layouts.VerticalLayout"*/
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.royale.core.ItemRendererClassFactory");
@@ -110,7 +110,7 @@ MenuItemRenderer
 Menu
 {
     IBeadView: ClassReference("org.apache.royale.mdl.beads.views.ListView");
-    IBeadModel: ClassReference("org.apache.royale.core.beads.models.ArraySelectionModel");
+    IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
     IBeadLayout: ClassReference(null); /*"org.apache.royale.html.beads.layouts.VerticalLayout"*/
     IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController");
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData");
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsDataItemRendererFactoryForArrayListData.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsDataItemRendererFactoryForArrayListData.as
index d05b693..c6b55ed 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsDataItemRendererFactoryForArrayListData.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsDataItemRendererFactoryForArrayListData.as
@@ -27,7 +27,7 @@ package org.apache.royale.mdl.beads
 
     import org.apache.royale.events.IEventDispatcher;
     import org.apache.royale.html.beads.DataItemRendererFactoryForArrayList;
-    import org.apache.royale.core.DataItemRenderer;
+    import org.apache.royale.html.supportClasses.DataItemRenderer;
     import org.apache.royale.mdl.beads.models.ITabModel;
     import org.apache.royale.mdl.supportClasses.ITabItemRenderer;
     import org.apache.royale.events.Event;
@@ -72,7 +72,7 @@ package org.apache.royale.mdl.beads
          * @royaleignorecoercion org.apache.royale.core.IList
          * @royaleignorecoercion org.apache.royale.core.IListPresentationModel
          * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
-         * @royaleignorecoercion org.apache.royale.core.DataItemRenderer
+         * @royaleignorecoercion org.apache.royale.html.supportClasses.DataItemRenderer
          * @royaleignorecoercion org.apache.royale.mdl.supportClasses.ITabItemRenderer
          */
         override protected function dataProviderChangeHandler(event:Event):void
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererFactoryForArrayData.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererFactoryForArrayData.as
index da15186..1c4265c 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsItemRendererFactoryForArrayData.as
@@ -30,7 +30,7 @@ package org.apache.royale.mdl.beads
     import org.apache.royale.events.EventDispatcher;
     import org.apache.royale.events.IEventDispatcher;
     import org.apache.royale.events.ItemRendererEvent;
-    import org.apache.royale.core.IListView;
+    import org.apache.royale.html.beads.IListView;
     import org.apache.royale.mdl.beads.models.ITabModel;
     import org.apache.royale.events.Event;
     import org.apache.royale.mdl.supportClasses.ITabItemRenderer;
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/models/DropDownListModel.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/models/DropDownListModel.as
index 79c0cb5..b23df72 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/models/DropDownListModel.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/models/DropDownListModel.as
@@ -19,7 +19,7 @@
 package org.apache.royale.mdl.beads.models
 {
     import org.apache.royale.events.Event;
-    import org.apache.royale.core.beads.models.ArraySelectionModel;
+    import org.apache.royale.html.beads.models.ArraySelectionModel;
 
     /**
      *  The DropDownListModel class defines the data associated with an org.apache.royale.mdl.DropDownListModel
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/models/TabArrayModel.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/models/TabArrayModel.as
index 93d2f41..b760b50 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/models/TabArrayModel.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/models/TabArrayModel.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.mdl.beads.models
 {
-    import org.apache.royale.core.beads.models.ArraySelectionModel;
+    import org.apache.royale.html.beads.models.ArraySelectionModel;
 
     /**
      *  The TabArrayModel class defines the data associated with an org.apache.royale.mdl.Tabs
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/views/DropDownListView.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/views/DropDownListView.as
index fd6afef..08e2566 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/views/DropDownListView.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/views/DropDownListView.as
@@ -22,7 +22,7 @@ package org.apache.royale.mdl.beads.views
     import org.apache.royale.core.IStrand;
     import org.apache.royale.html.elements.Option;
     import org.apache.royale.html.elements.Select;
-    import org.apache.royale.core.beads.views.DataContainerView;
+    import org.apache.royale.html.beads.DataContainerView;
     import org.apache.royale.mdl.DropDownList;
     import org.apache.royale.events.Event;
 
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/DropDownListItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/DropDownListItemRenderer.as
index 3a5a8b1..69f3349 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/DropDownListItemRenderer.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/DropDownListItemRenderer.as
@@ -19,7 +19,7 @@
 package org.apache.royale.mdl.itemRenderers
 {
     import org.apache.royale.html.elements.Option;
-    import org.apache.royale.core.MXMLItemRenderer;
+    import org.apache.royale.html.supportClasses.MXMLItemRenderer;
 
     COMPILE::JS
     {
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/FooterLinkItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/FooterLinkItemRenderer.as
index aebc139..25de50b 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/FooterLinkItemRenderer.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/FooterLinkItemRenderer.as
@@ -24,7 +24,7 @@ package org.apache.royale.mdl.itemRenderers
 		import org.apache.royale.html.util.addElementToWrapper;
     }
 
-	import org.apache.royale.core.MXMLItemRenderer;
+	import org.apache.royale.html.supportClasses.MXMLItemRenderer;
     
 	/**
 	 *  The FooterLinkItemRenderer defines the basic Item Renderer for a MDL Footer Link List Component.
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/ListItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/ListItemRenderer.as
index 76ae103..0c0c4fe 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/ListItemRenderer.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/ListItemRenderer.as
@@ -24,7 +24,7 @@ package org.apache.royale.mdl.itemRenderers
 		import org.apache.royale.html.util.addElementToWrapper;
     }
 
-	import org.apache.royale.core.MXMLItemRenderer;;
+	import org.apache.royale.html.supportClasses.MXMLItemRenderer;
     
 	/**
 	 *  The ListItemRenderer defines the basic Item Renderer for a MDL List Component.
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/MenuItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/MenuItemRenderer.as
index 6234615..15d1ec2 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/MenuItemRenderer.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/MenuItemRenderer.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.mdl.itemRenderers
 {
-    import org.apache.royale.core.MXMLItemRenderer;;
+    import org.apache.royale.html.supportClasses.MXMLItemRenderer;;
 
     COMPILE::JS
     {
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/NavigationLinkItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/NavigationLinkItemRenderer.as
index bab8c53..93ca1d0 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/NavigationLinkItemRenderer.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/NavigationLinkItemRenderer.as
@@ -24,7 +24,7 @@ package org.apache.royale.mdl.itemRenderers
 		import org.apache.royale.html.util.addElementToWrapper;
     }
 
-	import org.apache.royale.core.MXMLItemRenderer;;
+	import org.apache.royale.html.supportClasses.MXMLItemRenderer;;
     
 	/**
 	 *  The NavigationLinkItemRenderer defines the basic Item Renderer for a MDL NavigationLink List Component.
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/TableRowItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/TableRowItemRenderer.as
index 16ce601..45b556e 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/TableRowItemRenderer.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/TableRowItemRenderer.as
@@ -25,7 +25,7 @@ package org.apache.royale.mdl.itemRenderers
     }
 
 	import org.apache.royale.html.TableRow;
-	import org.apache.royale.core.MXMLItemRenderer;;
+	import org.apache.royale.html.supportClasses.MXMLItemRenderer;;
     
 	/**
 	 *  The TableItemRenderer defines the basic Item Renderer for a MDL Table Component.
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/supportClasses/TabBarButtonItemRendererBase.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/supportClasses/TabBarButtonItemRendererBase.as
index 2e8e75f..e81a697 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/supportClasses/TabBarButtonItemRendererBase.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/supportClasses/TabBarButtonItemRendererBase.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.mdl.supportClasses
 {
-    import org.apache.royale.core.MXMLItemRenderer;;
+    import org.apache.royale.html.supportClasses.MXMLItemRenderer;;
 
     COMPILE::JS
     {
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/supportClasses/TabItemRendererBase.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/supportClasses/TabItemRendererBase.as
index 2051070..6347d9e 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/supportClasses/TabItemRendererBase.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/supportClasses/TabItemRendererBase.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.mdl.supportClasses
 {
-    import org.apache.royale.core.MXMLItemRenderer;;
+    import org.apache.royale.html.supportClasses.MXMLItemRenderer;;
 
     COMPILE::JS
     {
diff --git a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/beads/ViewManagerViewBase.as b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/beads/ViewManagerViewBase.as
index 6544561..98675d5 100644
--- a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/beads/ViewManagerViewBase.as
+++ b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/beads/ViewManagerViewBase.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.mobile.beads
 {
-	import org.apache.royale.core.beads.GroupView;
+	import org.apache.royale.html.beads.GroupView;
 	import org.apache.royale.core.IBeadModel;
 	import org.apache.royale.core.IBeadView;
 	import org.apache.royale.core.IStrand;


Mime
View raw message