remove circular dependency between io and css

https://bugs.eclipse.org/bugs/show_bug.cgi?id=409893
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DummyValidator.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DummyValidator.java
index 4528b29..e33020f 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DummyValidator.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/dom/DummyValidator.java
@@ -15,8 +15,8 @@
 import java.util.Set;

 

 import org.eclipse.core.runtime.QualifiedName;

-import org.eclipse.vex.core.internal.io.DocumentContentModel;

 import org.eclipse.vex.core.provisional.dom.AttributeDefinition;

+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;

 import org.eclipse.vex.core.provisional.dom.IAttribute;

 import org.eclipse.vex.core.provisional.dom.IElement;

 import org.eclipse.vex.core.provisional.dom.IValidator;

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/DocumentContentModelTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/DocumentContentModelTest.java
index 7a55ca6..e643210 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/DocumentContentModelTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/DocumentContentModelTest.java
@@ -20,6 +20,7 @@
 

 import org.eclipse.core.runtime.QualifiedName;

 import org.eclipse.vex.core.internal.dom.Element;

+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;

 import org.eclipse.vex.core.tests.TestResources;

 import org.eclipse.vex.core.tests.VEXCoreTestPlugin;

 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/DocumentReaderTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/DocumentReaderTest.java
index 8d181dd..2a36882 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/DocumentReaderTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/DocumentReaderTest.java
@@ -25,6 +25,7 @@
 import org.eclipse.vex.core.IFilter;

 import org.eclipse.vex.core.internal.dom.DummyValidator;

 import org.eclipse.vex.core.provisional.dom.BaseNodeVisitorWithResult;

+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;

 import org.eclipse.vex.core.provisional.dom.IAxis;

 import org.eclipse.vex.core.provisional.dom.IComment;

 import org.eclipse.vex.core.provisional.dom.IDocument;

diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/SpaceNormalizerTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/SpaceNormalizerTest.java
index 8a5c7ca..93cbdb9 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/SpaceNormalizerTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/io/SpaceNormalizerTest.java
@@ -42,10 +42,12 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.vex.core.internal.core.DisplayDevice;
 import org.eclipse.vex.core.internal.css.CssWhitespacePolicy;
+import org.eclipse.vex.core.internal.css.IStyleSheetProvider;
 import org.eclipse.vex.core.internal.css.MockDisplayDevice;
 import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.css.StyleSheetReader;
 import org.eclipse.vex.core.internal.dom.DummyValidator;
+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;
 import org.eclipse.vex.core.provisional.dom.IDocument;
 import org.eclipse.vex.core.provisional.dom.IElement;
 import org.eclipse.vex.core.provisional.dom.INode;
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
index 98bceed..6d6e6dc 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/layout/LayoutTestSuite.java
@@ -27,14 +27,14 @@
 import junit.framework.TestSuite;
 
 import org.eclipse.vex.core.internal.css.CssWhitespacePolicy;
+import org.eclipse.vex.core.internal.css.IStyleSheetProvider;
 import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.css.StyleSheetReader;
 import org.eclipse.vex.core.internal.dom.DummyValidator;
-import org.eclipse.vex.core.internal.io.DocumentContentModel;
 import org.eclipse.vex.core.internal.io.DocumentReader;
-import org.eclipse.vex.core.internal.io.IStyleSheetProvider;
 import org.eclipse.vex.core.provisional.dom.BaseNodeVisitorWithResult;
 import org.eclipse.vex.core.provisional.dom.ContentRange;
+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;
 import org.eclipse.vex.core.provisional.dom.IDocument;
 import org.eclipse.vex.core.provisional.dom.IElement;
 import org.eclipse.vex.core.provisional.dom.INode;
diff --git a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/validator/SchemaValidatorTest.java b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/validator/SchemaValidatorTest.java
index 9727ac4..3974759 100644
--- a/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/validator/SchemaValidatorTest.java
+++ b/org.eclipse.vex.core.tests/src/org/eclipse/vex/core/internal/validator/SchemaValidatorTest.java
@@ -29,8 +29,8 @@
 import org.eclipse.core.runtime.QualifiedName;

 import org.eclipse.vex.core.internal.dom.Document;

 import org.eclipse.vex.core.internal.dom.Element;

-import org.eclipse.vex.core.internal.io.DocumentContentModel;

 import org.eclipse.vex.core.internal.io.DocumentReader;

+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;

 import org.eclipse.vex.core.provisional.dom.IDocument;

 import org.eclipse.vex.core.provisional.dom.IElement;

 import org.eclipse.vex.core.provisional.dom.IValidator;

diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/CssWhitespacePolicy.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/CssWhitespacePolicy.java
index ee8abb6..28f4a18 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/CssWhitespacePolicy.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/CssWhitespacePolicy.java
@@ -10,9 +10,7 @@
  *******************************************************************************/
 package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.vex.core.internal.io.DocumentContentModel;
-import org.eclipse.vex.core.internal.io.IWhitespacePolicy;
-import org.eclipse.vex.core.internal.io.IWhitespacePolicyFactory;
+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;
 import org.eclipse.vex.core.provisional.dom.INode;
 import org.eclipse.vex.core.provisional.dom.IValidator;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IStyleSheetProvider.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IStyleSheetProvider.java
similarity index 88%
rename from org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IStyleSheetProvider.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IStyleSheetProvider.java
index 2f8ac93..af76327 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IStyleSheetProvider.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IStyleSheetProvider.java
@@ -8,9 +8,9 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.vex.core.internal.io;

+package org.eclipse.vex.core.internal.css;

 

-import org.eclipse.vex.core.internal.css.StyleSheet;

+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;

 

 /**

  * @author Florian Thienel

diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IWhitespacePolicy.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IWhitespacePolicy.java
similarity index 96%
rename from org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IWhitespacePolicy.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IWhitespacePolicy.java
index f233f062..5f4391f 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IWhitespacePolicy.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IWhitespacePolicy.java
@@ -9,7 +9,7 @@
  *     John Krasnay - initial API and implementation
  *     Florian Thienel - a NULL object
  *******************************************************************************/
-package org.eclipse.vex.core.internal.io;
+package org.eclipse.vex.core.internal.css;
 
 import org.eclipse.vex.core.provisional.dom.INode;
 
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IWhitespacePolicyFactory.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IWhitespacePolicyFactory.java
similarity index 93%
rename from org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IWhitespacePolicyFactory.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IWhitespacePolicyFactory.java
index dd8834b..b359080 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/IWhitespacePolicyFactory.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/css/IWhitespacePolicyFactory.java
@@ -9,9 +9,9 @@
  *     John Krasnay - initial API and implementation
  *     Florian Thienel - a NULL object
  *******************************************************************************/
-package org.eclipse.vex.core.internal.io;
+package org.eclipse.vex.core.internal.css;
 
-import org.eclipse.vex.core.internal.css.StyleSheet;
+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;
 import org.eclipse.vex.core.provisional.dom.IValidator;
 
 /**
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentBuilder.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentBuilder.java
index 78d1b4a..24a06d8 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentBuilder.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentBuilder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2008 John Krasnay and others.
+ * Copyright (c) 2004, 2013 John Krasnay and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,6 +20,9 @@
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.vex.core.XML;
+import org.eclipse.vex.core.internal.css.IStyleSheetProvider;
+import org.eclipse.vex.core.internal.css.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.css.IWhitespacePolicyFactory;
 import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.dom.Comment;
 import org.eclipse.vex.core.internal.dom.Document;
@@ -28,6 +31,7 @@
 import org.eclipse.vex.core.internal.dom.Node;
 import org.eclipse.vex.core.provisional.dom.BaseNodeVisitorWithResult;
 import org.eclipse.vex.core.provisional.dom.ContentRange;
+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;
 import org.eclipse.vex.core.provisional.dom.DocumentValidationException;
 import org.eclipse.vex.core.provisional.dom.IComment;
 import org.eclipse.vex.core.provisional.dom.IContent;
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentReader.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentReader.java
index 4c8279e..cd60f50 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentReader.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentReader.java
@@ -22,6 +22,9 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.eclipse.vex.core.internal.css.IStyleSheetProvider;
+import org.eclipse.vex.core.internal.css.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.css.IWhitespacePolicyFactory;
 import org.eclipse.vex.core.provisional.dom.IDocument;
 import org.eclipse.vex.core.provisional.dom.IValidator;
 import org.xml.sax.ContentHandler;
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentWriter.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentWriter.java
index 1780926..b70ead2 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentWriter.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentWriter.java
@@ -17,6 +17,7 @@
 import java.io.PrintWriter;
 import java.util.Arrays;
 
+import org.eclipse.vex.core.internal.css.IWhitespacePolicy;
 import org.eclipse.vex.core.provisional.dom.AttributeDefinition;
 import org.eclipse.vex.core.provisional.dom.BaseNodeVisitor;
 import org.eclipse.vex.core.provisional.dom.IAttribute;
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/WTPVEXValidator.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/WTPVEXValidator.java
index 3c0b78c..37d7bf0 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/WTPVEXValidator.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/validator/WTPVEXValidator.java
@@ -24,9 +24,9 @@
 import java.util.Set;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.vex.core.internal.io.DocumentContentModel;
 import org.eclipse.vex.core.provisional.dom.AttributeDefinition;
 import org.eclipse.vex.core.provisional.dom.AttributeDefinition.Type;
+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;
 import org.eclipse.vex.core.provisional.dom.IAttribute;
 import org.eclipse.vex.core.provisional.dom.IElement;
 import org.eclipse.vex.core.provisional.dom.IValidator;
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IVexWidget.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IVexWidget.java
index 16a9eb1..a0353cc 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IVexWidget.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/IVexWidget.java
@@ -15,8 +15,8 @@
 
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.vex.core.internal.core.ElementName;
+import org.eclipse.vex.core.internal.css.IWhitespacePolicy;
 import org.eclipse.vex.core.internal.css.StyleSheet;
-import org.eclipse.vex.core.internal.io.IWhitespacePolicy;
 import org.eclipse.vex.core.internal.layout.Box;
 import org.eclipse.vex.core.internal.layout.BoxFactory;
 import org.eclipse.vex.core.internal.undo.CannotRedoException;
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/VexWidgetImpl.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/VexWidgetImpl.java
index 599276b..392379d 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/VexWidgetImpl.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/widget/VexWidgetImpl.java
@@ -35,12 +35,12 @@
 import org.eclipse.vex.core.internal.core.QualifiedNameComparator;
 import org.eclipse.vex.core.internal.core.Rectangle;
 import org.eclipse.vex.core.internal.css.CSS;
+import org.eclipse.vex.core.internal.css.IWhitespacePolicy;
 import org.eclipse.vex.core.internal.css.StyleSheet;
 import org.eclipse.vex.core.internal.css.StyleSheetReader;
 import org.eclipse.vex.core.internal.css.Styles;
 import org.eclipse.vex.core.internal.dom.Document;
 import org.eclipse.vex.core.internal.dom.Node;
-import org.eclipse.vex.core.internal.io.IWhitespacePolicy;
 import org.eclipse.vex.core.internal.layout.BlockBox;
 import org.eclipse.vex.core.internal.layout.Box;
 import org.eclipse.vex.core.internal.layout.BoxFactory;
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentContentModel.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/provisional/dom/DocumentContentModel.java
similarity index 97%
rename from org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentContentModel.java
rename to org.eclipse.vex.core/src/org/eclipse/vex/core/provisional/dom/DocumentContentModel.java
index 27a70a1..ad92c17 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/io/DocumentContentModel.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/provisional/dom/DocumentContentModel.java
@@ -8,14 +8,13 @@
  * Contributors:

  * 		Florian Thienel - initial API and implementation

  *******************************************************************************/

-package org.eclipse.vex.core.internal.io;

+package org.eclipse.vex.core.provisional.dom;

 

 import java.io.IOException;

 import java.net.MalformedURLException;

 import java.net.URL;

 import java.text.MessageFormat;

 

-import org.eclipse.vex.core.provisional.dom.IElement;

 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;

 import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;

 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;

diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/provisional/dom/IValidator.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/provisional/dom/IValidator.java
index e99b11e..5da5957 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/provisional/dom/IValidator.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/provisional/dom/IValidator.java
@@ -17,7 +17,6 @@
 import java.util.Set;
 
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.vex.core.internal.io.DocumentContentModel;
 
 /**
  * Represents an object that can validate the structure of a document.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/VexPreferences.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/VexPreferences.java
index 1580a72..52f04ea 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/VexPreferences.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/VexPreferences.java
@@ -15,9 +15,9 @@
 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.preferences.InstanceScope;

 import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.vex.core.internal.css.IStyleSheetProvider;

 import org.eclipse.vex.core.internal.css.StyleSheet;

-import org.eclipse.vex.core.internal.io.DocumentContentModel;

-import org.eclipse.vex.core.internal.io.IStyleSheetProvider;

+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;

 import org.eclipse.vex.ui.internal.config.ConfigurationRegistry;

 import org.eclipse.vex.ui.internal.config.Style;

 import org.eclipse.vex.ui.internal.editor.Messages;

diff --git a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypeFactory.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypeFactory.java
index 238c29c..bf7a2ff 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypeFactory.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/config/DoctypeFactory.java
@@ -16,8 +16,8 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.eclipse.vex.core.internal.io.DocumentContentModel;
 import org.eclipse.vex.core.internal.validator.WTPVEXValidator;
+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;
 
 /**
  * Factory for DocumentType objects.
diff --git a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexDocumentContentModel.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexDocumentContentModel.java
index d38a6e8..2aaefd2 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexDocumentContentModel.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/editor/VexDocumentContentModel.java
@@ -11,7 +11,7 @@
 package org.eclipse.vex.ui.internal.editor;

 

 import org.eclipse.swt.widgets.Shell;

-import org.eclipse.vex.core.internal.io.DocumentContentModel;

+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;

 import org.eclipse.vex.core.provisional.dom.IElement;

 import org.eclipse.vex.ui.internal.VexPlugin;

 import org.eclipse.vex.ui.internal.config.DocumentType;

diff --git a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DefaultOutlineProvider.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DefaultOutlineProvider.java
index 4e143dd..6af2965 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DefaultOutlineProvider.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/outline/DefaultOutlineProvider.java
@@ -18,7 +18,7 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.vex.core.internal.io.IWhitespacePolicy;
+import org.eclipse.vex.core.internal.css.IWhitespacePolicy;
 import org.eclipse.vex.core.provisional.dom.IDocument;
 import org.eclipse.vex.core.provisional.dom.IElement;
 import org.eclipse.vex.ui.internal.editor.VexEditor;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/VexWidget.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/VexWidget.java
index eca8a3c..40b1ca7 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/VexWidget.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/swt/VexWidget.java
@@ -58,8 +58,8 @@
 import org.eclipse.vex.core.internal.core.ElementName;
 import org.eclipse.vex.core.internal.core.Graphics;
 import org.eclipse.vex.core.internal.core.Rectangle;
+import org.eclipse.vex.core.internal.css.IWhitespacePolicy;
 import org.eclipse.vex.core.internal.css.StyleSheet;
-import org.eclipse.vex.core.internal.io.IWhitespacePolicy;
 import org.eclipse.vex.core.internal.layout.Box;
 import org.eclipse.vex.core.internal.layout.BoxFactory;
 import org.eclipse.vex.core.internal.widget.IBoxFilter;
diff --git a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/wizards/NewDocumentWizard.java b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/wizards/NewDocumentWizard.java
index d3052ee..8008c4b 100644
--- a/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/wizards/NewDocumentWizard.java
+++ b/org.eclipse.vex.ui/src/org/eclipse/vex/ui/internal/wizards/NewDocumentWizard.java
@@ -33,9 +33,9 @@
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 import org.eclipse.vex.core.internal.css.CssWhitespacePolicy;
 import org.eclipse.vex.core.internal.dom.Document;
-import org.eclipse.vex.core.internal.io.DocumentContentModel;
 import org.eclipse.vex.core.internal.io.DocumentWriter;
 import org.eclipse.vex.core.internal.validator.WTPVEXValidator;
+import org.eclipse.vex.core.provisional.dom.DocumentContentModel;
 import org.eclipse.vex.core.provisional.dom.IDocument;
 import org.eclipse.vex.core.provisional.dom.IElement;
 import org.eclipse.vex.ui.internal.VexPlugin;