continuing internalization

author: david_williams 2005-04-18 08:00:30 +0000
committer: david_williams 2005-04-18 08:00:30 +0000
commit: 4ad020f33bd9ae4c3b1dcc95ac14804bea8d4ac0 (patch)
tree: 85c347c480c85d69864be569d20183b0035d20eb /bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal
parent: 84861fab6da9bfdc0b203655234476fcb334ca7c (diff)
download: webtools.sourceediting-4ad020f33bd9ae4c3b1dcc95ac14804bea8d4ac0.tar.gz
webtools.sourceediting-4ad020f33bd9ae4c3b1dcc95ac14804bea8d4ac0.tar.xz
webtools.sourceediting-4ad020f33bd9ae4c3b1dcc95ac14804bea8d4ac0.zip
182 files changed, 1312 insertions, 356 deletions
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java
index 79920b54f4..55ebe6b741 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLContentBuilder.java
@@ -13,7 +13,7 @@ package org.eclipse.wst.html.core.internal;
 
 
 import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java
index 63311e80f4..f564c3bf0b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/HTMLCorePlugin.java
@@ -14,7 +14,7 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.HTMLFilesPreferenceNames;
+import org.eclipse.wst.html.core.internal.provisional.HTMLFilesPreferenceNames;
 import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
 import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
 import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java
index 47a66ddac3..26c6b90620 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/AbstractNodeCleanupHandler.java
@@ -13,13 +13,13 @@ package org.eclipse.wst.html.core.internal.cleanup;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.sse.core.events.StructuredDocumentEvent;
 import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
 import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
 import org.eclipse.wst.sse.core.internal.cleanup.StructuredCleanupPreferences;
 import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.document.IDOMModel;
+import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 
 abstract class AbstractNodeCleanupHandler implements IStructuredCleanupHandler {
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java
index 3b0e0d5c35..ff8006ca84 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/CSSTextNodeCleanupHandler.java
@@ -16,11 +16,11 @@ import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.document.IDOMModel;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.w3c.dom.Node;
 
 // nakamori_TODO: check and remove
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java
index 8c1c767416..356d54b479 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/ElementNodeCleanupHandler.java
@@ -24,27 +24,27 @@ import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.exceptions.SourceEditingRuntimeException;
 import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
 import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
 import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.sse.core.text.ITextRegionList;
-import org.eclipse.wst.xml.core.document.IDOMAttr;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.IDOMModel;
-import org.eclipse.wst.xml.core.document.IDOMNode;
-import org.eclipse.wst.xml.core.document.ISourceGenerator;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java
index dd87fe893f..21ea68fc3a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupHandlerFactory.java
@@ -14,8 +14,8 @@ package org.eclipse.wst.html.core.internal.cleanup;
 
 import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
 import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 import org.w3c.dom.Node;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java
index 04502a97c9..b7887493e6 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/cleanup/HTMLCleanupProcessorImpl.java
@@ -11,9 +11,9 @@
 package org.eclipse.wst.html.core.internal.cleanup;
 
 import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML;
 import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
 import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
+import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
 import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupHandler;
 import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
 import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java
index 321d0c46dc..292fe0ee71 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/commentelement/handlers/CommentElementHandlerForSSI.java
@@ -12,8 +12,6 @@ package org.eclipse.wst.html.core.internal.commentelement.handlers;
 
 
 
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.ISourceGenerator;
 import org.eclipse.wst.xml.core.internal.commentelement.CommentElementHandler;
 import org.eclipse.wst.xml.core.internal.commentelement.util.CommentElementFactory;
 import org.eclipse.wst.xml.core.internal.commentelement.util.TagScanner;
@@ -21,6 +19,8 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.ISourceGenerator;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java
index d1c5a06546..aa01bc11a6 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/AttributeCollection.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java
index bb9d68e5bc..263d75a6c6 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CMNodeImpl.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java
index c79f788eaa..f6e8dddabd 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdAddress.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java
index b0b2e59aa3..d617708299 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdColumnGroup.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java
index 561b2142d6..9e4a3e6899 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdDl.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java
index a96fcc616a..86e9186adf 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdEmbed.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java
index 61713a377f..bc9ed04f91 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFieldset.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java
index 42b79bdc59..7bd107655c 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdFrameset.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java
index e0e321c499..2157d6640d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHead.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java
index 7949e14282..263a811e5d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdHtml.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java
index edc4b6929d..aae68af49b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdLiContainer.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java
index 9e08bb3839..83f9b72af8 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdMap.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java
index f9a30c1123..f7ac09bf79 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdNoframesContent.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java
index e3f4fde2e3..a772f17371 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdOptionContainer.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java
index e2aa03ccd5..a82afb84ad 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdParamContainer.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java
index 50659d06bc..b7f6c09e32 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdSelect.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java
index 6357a3bb18..9e61b510b5 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTable.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java
index 24a6ad61c8..40ddbc5a73 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTableCellContainer.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java
index 2f8b5ef696..53adfc6ad3 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/CtdTrContainer.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java
index db0c9888d2..340b0c5bec 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ElementCollection.java
@@ -22,7 +22,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 /**
  * Factory for element declarations.
  */
-final class ElementCollection extends DeclCollection implements org.eclipse.wst.html.core.HTML40Namespace.ElementName {
+final class ElementCollection extends DeclCollection implements org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ElementName {
 
 
 	// Element IDs
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java
index 8343a9256c..350594fb14 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/EntityCollection.java
@@ -19,7 +19,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 /**
  * Factory for entity declarations.
  */
-final class EntityCollection extends DeclCollection implements org.eclipse.wst.html.core.HTML40Namespace.EntityName {
+final class EntityCollection extends DeclCollection implements org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.EntityName {
 
 
 	private static class Ids {
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java
index f044ef6571..c03b2ec51d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLAttrDeclImpl.java
@@ -16,7 +16,7 @@ import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java
index 00650f5720..18e901eb5b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLCMDocumentFactory.java
@@ -14,8 +14,8 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Hashtable;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
 import org.eclipse.wst.html.core.internal.contentmodel.chtml.CHCMDocImpl;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java
index 4ef99ba35f..2cc09fdf4a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLElemDeclImpl.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java
index 61f4eaf2f0..137647e699 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HTMLEntityDeclImpl.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java
index b4890041a5..74d61fbce5 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedA.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java
index 8210a00fcc..4f9b73c730 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedADDRESS.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java
index 7365806f4a..d8244cdb4b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAPPLET.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java
index 69d951a0a1..567e6ce1f4 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedAREA.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java
index 2c001719bd..7417dae557 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASE.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java
index c2bd5e9f32..01ccce0291 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBASEFONT.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java
index d8365bf4d3..67c2609e9d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBDO.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java
index e85ee5af47..03b0881c41 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBGSOUND.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java
index 75dfe539b0..b587b23202 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBLOCKQUOTE.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java
index 4cfd615559..ad529603ea 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBODY.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java
index 6232117b58..39749a5ae5 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBR.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java
index 568fb476aa..a52b93f1bf 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedBUTTON.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java
index 7f409280bb..167086c6b3 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCAPTION.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java
index 029e3656a2..310a8758f2 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCENTER.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java
index 2e2214a7f0..e381ed3a09 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOL.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java
index 2903b7e8db..1b1ee40777 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedCOLGROUP.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java
index 06676e76f2..a200227944 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDD.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java
index 401399ed7a..54aa19d2c6 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDIV.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java
index c6535a553e..ec67ee9c6a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDL.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java
index 4fa23ab9a7..7ace82239e 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedDT.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java
index 89b4c6a796..558a3d7c28 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedEMBED.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java
index 1d76bff525..2db5e0dcc5 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFIELDSET.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java
index 21da885a3c..fc610b52fe 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFONT.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java
index 561610ed23..542abfbfe5 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFORM.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java
index 6c91365f10..bb844cddc0 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAME.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java
index a3be42bb97..0f389610a2 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFRAMESET.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java
index c02371e9fc..a3d1a9abfc 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedFontStyle.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java
index c9323dad86..d2c2e8aeb9 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHEAD.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java
index d7a5f6dd99..bf7155e6b8 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHR.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java
index d4934c3296..810c12417b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHTML.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java
index d6b644e34e..21b2593708 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedHeading.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java
index cc9290c474..6036741d1b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIFRAME.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java
index c73fcc9079..eb126db308 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedIMG.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java
index deca6e6328..ecf5aaebdd 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedINPUT.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java
index 2a7df91a79..c3ec75d6de 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedISINDEX.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java
index f172b46591..5b3ceb1d92 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLABEL.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java
index 888c5656b4..f66d866851 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLEGEND.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java
index 5dacdfb167..9012dab124 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLI.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java
index b7779c3b4d..5fe5269231 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedLINK.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java
index 13ce8b61ec..4e1036f871 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMAP.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java
index 4dd399f612..c9cadcb325 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMARQUEE.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java
index d6bb4642d5..7aa0378e67 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMENU.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java
index e9cbdea413..3b7e0088cc 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMETA.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java
index 0e97abd4fc..3cff404a8d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedMarkChanges.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java
index e1041258f8..4e3a1a2eb9 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOBR.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java
index 6be05205de..3d5d5fdbc5 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOEMBED.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java
index 83940650a9..b33f9b6f54 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOFRAMES.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java
index 2f29dd8bf9..df9a403a60 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedNOSCRIPT.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java
index 8d9f98ddae..f229abb89a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOBJECT.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java
index 6c0fbf21c1..ad26f3a4e8 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOL.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java
index be680cb9f6..1367344e6d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTGROUP.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java
index 2de188e0e3..0568bd741a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedOPTION.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java
index 9bf079f06d..6646fe7638 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedP.java
@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Vector;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java
index ba9879cee3..bb44fe55b1 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPARAM.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java
index 6df4ec2eed..fbd5b966dd 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedPRE.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java
index b8a0de29df..018232f8b2 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedQ.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java
index b66b0f32f1..a279a0d229 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSCRIPT.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java
index e3155f6dd2..8e3c3f41d1 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSELECT.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java
index 1ab6079d95..b5aaa179a8 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSPAN.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java
index 71330951bc..6638be7c27 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIBase.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java
index f8117bff96..71d292c455 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIConfig.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java
index 4a18ea576b..38c5e6d384 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIEcho.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java
index 7d2e0cd68d..b2c3c8521a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIExec.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java
index 7c4b124d81..4a83941837 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFlastmod.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java
index a60a47e77f..93f7541447 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIFsize.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java
index 2b73be4327..d28a5532bd 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIInclude.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java
index 351942a286..05c303d20b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSIPrintenv.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java
index 50faca1513..ed8c41ab8e 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSSISet.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java
index ad9c3a67d1..3782d5b3c7 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedSTYLE.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java
index d921ada949..dab20e106d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedScripts.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java
index e0e0139762..60b3b4a088 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTABLE.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java
index 576538cd34..4fb0f5e8b0 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTEXTAREA.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java
index 19eefc9b3e..eba07302cd 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTITLE.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java
index 1c3eddd278..cf15cf0a43 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTR.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java
index 4aaa8d053d..ad2e6a7a00 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableBody.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java
index 2ff0d3099a..5a791e6426 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedTableCell.java
@@ -15,7 +15,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java
index 14f8dacfe4..2244e67244 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedUL.java
@@ -14,7 +14,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Arrays;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java
index f7b08d6c10..2e4e54df4e 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/HedWBR.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java
index cc8acf6b45..a7f7568057 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/JSPElementCollection.java
@@ -18,7 +18,7 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Vector;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java
index 3ffb396e50..dd5564a271 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/PropertyProviderFactory.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.contentmodel;
 
 import java.util.Hashtable;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java
index 3aa8424ac2..95d5c21a1d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CHTMLNamespace.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel.chtml;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java
index fb242d68e5..c3838487fb 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/CMNodeImpl.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel.chtml;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java
index 826be12f3b..c2fca7b079 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/ElementCollection.java
@@ -22,7 +22,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 /**
  * Factory for element declarations.
  */
-final class ElementCollection extends DeclCollection implements org.eclipse.wst.html.core.HTML40Namespace.ElementName {
+final class ElementCollection extends DeclCollection implements org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ElementName {
 
 
 	// Element IDs
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java
index fe0ae2803c..7b44593534 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/EntityCollection.java
@@ -19,7 +19,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 /**
  * Factory for entity declarations.
  */
-final class EntityCollection extends DeclCollection implements org.eclipse.wst.html.core.HTML40Namespace.EntityName {
+final class EntityCollection extends DeclCollection implements org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.EntityName {
 
 
 	private static class Ids {
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java
index d5aa9b5e66..505d6622d7 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLAttrDeclImpl.java
@@ -16,8 +16,8 @@ import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java
index a75268b8cc..8fd08ccb25 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLElemDeclImpl.java
@@ -14,10 +14,10 @@ package org.eclipse.wst.html.core.internal.contentmodel.chtml;
 
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLPropertyDeclaration;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java
index 496e93a7c6..c63d2a8e70 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HTMLEntityDeclImpl.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel.chtml;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLEntityDeclaration;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java
index 6ffdbe5940..b0e0bd37c7 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/HedSSIBase.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.contentmodel.chtml;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 
 
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java
index 847610309d..f37df45dac 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/chtml/PropertyProviderFactory.java
@@ -12,9 +12,9 @@ package org.eclipse.wst.html.core.internal.contentmodel.chtml;
 
 import java.util.Hashtable;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLPropertyDeclaration;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java
index 7de746b01c..949941f877 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentmodel/ssi/SSICMDocumentFactory.java
@@ -13,8 +13,8 @@ package org.eclipse.wst.html.core.internal.contentmodel.ssi;
 import java.util.Hashtable;
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java
index e464beeb5a..ff46210422 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/DocumentStyleImpl.java
@@ -17,10 +17,10 @@
 package org.eclipse.wst.html.core.internal.document;
 
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
-import org.eclipse.wst.xml.core.document.IDOMModel;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
 import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java
index 2198b24145..943218bcac 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/ElementStyleImpl.java
@@ -18,9 +18,9 @@ package org.eclipse.wst.html.core.internal.document;
 
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.xml.core.document.IDOMElement;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
 import org.eclipse.wst.xml.core.internal.document.ElementImpl;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.css.CSSStyleDeclaration;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java
index 5c803fd722..0c93f35bce 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLConverter.java
@@ -19,15 +19,15 @@ import java.io.UnsupportedEncodingException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
 import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
-import org.eclipse.wst.xml.core.document.IDOMDocumentType;
-import org.eclipse.wst.xml.core.document.IDOMModel;
+import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java
index 49d80e53bd..b03fe03e89 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapter.java
@@ -18,17 +18,17 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.ui.contentproperties.ContentSettings;
-import org.eclipse.wst.sse.ui.contentproperties.ContentSettingsChangeSubject;
-import org.eclipse.wst.sse.ui.contentproperties.IContentSettings;
-import org.eclipse.wst.sse.ui.contentproperties.IContentSettingsListener;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
-import org.eclipse.wst.xml.core.document.IDOMDocumentType;
-import org.eclipse.wst.xml.core.document.IDOMModel;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.ContentSettings;
+import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.ContentSettingsChangeSubject;
+import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.IContentSettings;
+import org.eclipse.wst.sse.ui.internal.provisional.contentproperties.IContentSettingsListener;
 import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
 import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapterImpl;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java
index 28cb567f6e..68821c9cac 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeAdapterFactory.java
@@ -14,12 +14,12 @@ package org.eclipse.wst.html.core.internal.document;
 
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 
 /**
  */
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java
index 8ae9ce4b1a..7b76801175 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapter.java
@@ -12,12 +12,10 @@ package org.eclipse.wst.html.core.internal.document;
 
 
 
-import org.eclipse.wst.html.core.HTML40Namespace;
-import org.eclipse.wst.html.core.HTMLCMProperties;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLElementDeclaration;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.IDOMText;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
@@ -26,6 +24,8 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
 import org.eclipse.wst.xml.core.internal.document.CMNodeUtil;
 import org.eclipse.wst.xml.core.internal.document.ModelParserAdapter;
 import org.eclipse.wst.xml.core.internal.document.TagAdapter;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java
index 08f03f9f44..c2dd4d063d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLModelParserAdapterFactory.java
@@ -12,9 +12,9 @@ package org.eclipse.wst.html.core.internal.document;
 
 
 
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.document.ModelParserAdapter;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java
index 5fa2103f73..4fc4ca99e9 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/MetaDataAdapter.java
@@ -14,14 +14,14 @@ package org.eclipse.wst.html.core.internal.document;
 
 import java.util.Iterator;
 
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.sse.core.text.ITextRegionList;
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.IDOMModel;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
 import org.eclipse.wst.xml.core.internal.document.TagAdapter;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java
index 94cd5e8030..c6fcf4ad42 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/UnknownTagAdapter.java
@@ -12,9 +12,9 @@ package org.eclipse.wst.html.core.internal.document;
 
 
 
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.xml.core.document.IDOMElement;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.document.TagAdapter;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 
 /**
  */
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java
index b6f6c47194..43a50a940c 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLDocumentLoader.java
@@ -14,18 +14,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML;
 import org.eclipse.wst.html.core.internal.contenttype.EncodingGuesser;
 import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeAdapterFactory;
 import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory;
 import org.eclipse.wst.html.core.internal.htmlcss.HTMLStyleSelectorAdapterFactory;
 import org.eclipse.wst.html.core.internal.htmlcss.StyleAdapterFactory;
 import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForHTML;
+import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
 import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.document.IEncodedDocument;
 import org.eclipse.wst.sse.core.internal.PropagatingAdapter;
 import org.eclipse.wst.sse.core.internal.document.AbstractDocumentLoader;
 import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
@@ -34,12 +30,16 @@ import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
 import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
 import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
 import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
 import org.eclipse.wst.xml.core.internal.parser.XMLStructuredDocumentReParser;
 import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 
 public class HTMLDocumentLoader extends AbstractDocumentLoader {
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java
index 60861f2729..0f84fc838b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/encoding/HTMLModelLoader.java
@@ -19,19 +19,19 @@ import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory
 import org.eclipse.wst.html.core.internal.htmlcss.HTMLStyleSelectorAdapterFactory;
 import org.eclipse.wst.html.core.internal.htmlcss.StyleAdapterFactory;
 import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForHTML;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.IModelLoader;
 import org.eclipse.wst.sse.core.internal.PropagatingAdapter;
 import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
 import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
 import org.eclipse.wst.sse.core.internal.model.AbstractModelLoader;
+import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.DebugAdapterFactory;
 import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
 import org.eclipse.wst.xml.core.internal.propagate.PropagatingAdapterFactoryImpl;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 
 public class HTMLModelLoader extends AbstractModelLoader {
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java
index c7438f8d0c..294906cb59 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/EmbeddedCSSFormatter.java
@@ -16,11 +16,11 @@ import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.html.core.HTMLFormatContraints;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.xml.core.document.IDOMNode;
-import org.eclipse.wst.xml.core.document.IDOMText;
+import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
 
 // nakamori_TODO: check and remove
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java
index 6667d85933..27fcc9b41b 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLElementFormatter.java
@@ -16,14 +16,14 @@ import org.eclipse.wst.css.core.internal.format.CSSSourceFormatter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.html.core.HTMLFormatContraints;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.sse.core.text.ITextRegionList;
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 import org.w3c.dom.Attr;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java
index d0e4f46007..c650384853 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatContraintsImpl.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.format;
 
-import org.eclipse.wst.html.core.HTMLFormatContraints;
+import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
 import org.eclipse.wst.sse.core.internal.format.StructuredFormatContraints;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java
index ad151cecfe..daee7dcd64 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLFormatter.java
@@ -13,22 +13,22 @@ package org.eclipse.wst.html.core.internal.format;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.html.core.HTMLCMProperties;
-import org.eclipse.wst.html.core.HTMLFormatContraints;
 import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
 import org.eclipse.wst.sse.core.internal.SSECorePlugin;
 import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
 import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
 import org.eclipse.wst.sse.core.internal.format.IStructuredFormatter;
 import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.IDOMModel;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
 import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
 import org.w3c.dom.Document;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java
index 9264fbad67..a152f8241e 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/format/HTMLTextFormatter.java
@@ -12,13 +12,13 @@ package org.eclipse.wst.html.core.internal.format;
 
 
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
-import org.eclipse.wst.html.core.HTMLFormatContraints;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.IDOMNode;
-import org.eclipse.wst.xml.core.document.IDOMText;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLFormatContraints;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractCSSModelAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractCSSModelAdapter.java
index 46beaeca70..aa1be40742 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractCSSModelAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractCSSModelAdapter.java
@@ -13,14 +13,14 @@ package org.eclipse.wst.html.core.internal.htmlcss;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS;
 import org.eclipse.wst.css.core.internal.document.CSSModelImpl;
 import org.eclipse.wst.css.core.internal.provisional.adapters.ICSSModelAdapter;
+import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.w3c.dom.Element;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractStyleSheetAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractStyleSheetAdapter.java
index 18945fc240..d92f7d2c5e 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractStyleSheetAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/AbstractStyleSheetAdapter.java
@@ -21,11 +21,11 @@ import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
 import org.eclipse.wst.css.core.internal.util.ImportedCollector;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.xml.core.document.IDOMModel;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.document.XMLModelNotifier;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLDocumentAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLDocumentAdapter.java
index cb2d0f380d..3aed14c4e1 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLDocumentAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLDocumentAdapter.java
@@ -26,11 +26,11 @@ import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
 import org.eclipse.wst.css.core.internal.util.CSSClassTraverser;
 import org.eclipse.wst.css.core.internal.util.ImportRuleCollector;
-import org.eclipse.wst.html.core.HTML40Namespace;
 import org.eclipse.wst.html.core.internal.contentmodel.JSP11Namespace;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.xml.core.document.IDOMElement;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapter.java
index f51c7919f8..f0df7b775a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapter.java
@@ -16,7 +16,7 @@ import java.util.StringTokenizer;
 
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-import org.eclipse.wst.sse.core.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.w3c.dom.Element;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapterFactory.java
index 334bf39282..e06a98344c 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapterFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/HTMLStyleSelectorAdapterFactory.java
@@ -13,9 +13,9 @@ package org.eclipse.wst.html.core.internal.htmlcss;
 
 
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSelectorAdapter;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 
 /**
  * Insert the type's description here.
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/LinkElementAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/LinkElementAdapter.java
index 8df47853e7..dda0f51ca2 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/LinkElementAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/LinkElementAdapter.java
@@ -14,15 +14,15 @@ import java.io.UnsupportedEncodingException;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
+import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.document.IDOMModel;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -77,7 +77,7 @@ public class LinkElementAdapter extends AbstractStyleSheetAdapter {
 		URIResolver resolver = baseModel.getResolver();
 
 		// resolve to absolute url : this need not exact location of css file. It is important that absurl is not null. 
-		String ref = getElement().getAttribute(org.eclipse.wst.html.core.HTML40Namespace.ATTR_NAME_HREF);
+		String ref = getElement().getAttribute(org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ATTR_NAME_HREF);
 		String absurl = (resolver != null && ref != null) ? resolver.getLocationByURI(ref, true) : null;
 		if ((absurl == null) || (absurl.length() == 0)) {
 			IPath basePath = new Path(baseModel.getBaseLocation());
@@ -147,7 +147,7 @@ public class LinkElementAdapter extends AbstractStyleSheetAdapter {
 
 			IDOMNode node = (IDOMNode) getElement();
 			if (node != null) {
-				node.notify(INodeNotifier.CHANGE, getElement().getAttributeNode(org.eclipse.wst.html.core.HTML40Namespace.ATTR_NAME_HREF), null, null, node.getStartOffset());
+				node.notify(INodeNotifier.CHANGE, getElement().getAttributeNode(org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ATTR_NAME_HREF), null, null, node.getStartOffset());
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAdapterFactory.java
index 64e1f11a1a..83318dfa0c 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAdapterFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAdapterFactory.java
@@ -15,10 +15,10 @@ package org.eclipse.wst.html.core.internal.htmlcss;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
-import org.eclipse.wst.html.core.HTML40Namespace;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAttrAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAttrAdapter.java
index 8bf7ec1394..db14d1c54e 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAttrAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleAttrAdapter.java
@@ -15,18 +15,18 @@ package org.eclipse.wst.html.core.internal.htmlcss;
 import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleDeclarationAdapter;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.events.StructuredDocumentRegionsReplacedEvent;
 import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
+import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
+import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
+import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
+import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
+import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -231,7 +231,7 @@ public class StyleAttrAdapter extends AbstractCSSModelAdapter implements IStruct
 			return; // error
 
 		String value = null;
-		Attr attr = element.getAttributeNode(org.eclipse.wst.html.core.HTML40Namespace.ATTR_NAME_STYLE);
+		Attr attr = element.getAttributeNode(org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ATTR_NAME_STYLE);
 		if (attr != null)
 			value = ((IDOMNode) attr).getValueSource();
 		structuredDocument.setText(this, value);
@@ -243,6 +243,6 @@ public class StyleAttrAdapter extends AbstractCSSModelAdapter implements IStruct
 	 * @return boolean
 	 */
 	private boolean isModelNecessary() {
-		return getElement() != null && getElement().getAttributeNode(org.eclipse.wst.html.core.HTML40Namespace.ATTR_NAME_STYLE) != null;
+		return getElement() != null && getElement().getAttributeNode(org.eclipse.wst.html.core.internal.provisional.HTML40Namespace.ATTR_NAME_STYLE) != null;
 	}
 }
 \ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleElementAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleElementAdapter.java
index ea5edc4ccf..73e378fded 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleElementAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/StyleElementAdapter.java
@@ -15,19 +15,19 @@ package org.eclipse.wst.html.core.internal.htmlcss;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IModelProvideAdapter;
 import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetListAdapter;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.html.core.HTML40Namespace;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.document.IDOMModel;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
+import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
+import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
+import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
+import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
+import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLModelProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLModelProvider.java
index 24188420d8..847d632f00 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLModelProvider.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/htmlcss/URLModelProvider.java
@@ -29,18 +29,18 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeConstants;
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.exceptions.ResourceInUse;
 import org.eclipse.wst.sse.core.internal.encoding.EncodingRule;
+import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
+import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
 import org.eclipse.wst.sse.core.internal.util.PathHelper;
 import org.eclipse.wst.sse.core.internal.util.ProjectResolver;
 import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
-import org.eclipse.wst.xml.core.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java
index f4b9cfa653..ef7311cf04 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/EmbeddedHTML.java
@@ -21,12 +21,12 @@ import org.eclipse.wst.html.core.internal.document.HTMLModelParserAdapterFactory
 import org.eclipse.wst.html.core.internal.htmlcss.HTMLStyleSelectorAdapterFactory;
 import org.eclipse.wst.html.core.internal.htmlcss.StyleAdapterFactory;
 import org.eclipse.wst.html.core.internal.modelquery.ModelQueryAdapterFactoryForEmbeddedHTML;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
 import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
 import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
 import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTagParser;
 import org.eclipse.wst.sse.core.internal.ltk.parser.JSPCapableParser;
 import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
 import org.eclipse.wst.sse.core.internal.util.Assert;
 import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
 import org.eclipse.wst.xml.core.internal.document.ModelParserAdapter;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java
index 9907ace7cd..06cc15a774 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelhandler/ModelHandlerForHTML.java
@@ -13,11 +13,11 @@ package org.eclipse.wst.html.core.internal.modelhandler;
 import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentCharsetDetector;
 import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentLoader;
 import org.eclipse.wst.html.core.internal.encoding.HTMLModelLoader;
-import org.eclipse.wst.sse.core.IModelLoader;
 import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
 import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
 import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler;
 import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
+import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
 
 public class ModelHandlerForHTML extends AbstractModelHandler implements IModelHandler {
 	/** 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java
index 5e70f549b8..c71b4e050f 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMElementDeclarationBuddySystem.java
@@ -11,8 +11,8 @@
 package org.eclipse.wst.html.core.internal.modelquery;
 
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java
index 3e508733cd..b7a8be72b7 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/CMNodeBuddySystem.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.modelquery;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java
index 8ca043c68d..23e396dedd 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapter.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.modelquery;
 
 
 
-import org.eclipse.wst.sse.core.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java
index 46d3abf7b9..a4981cb286 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ElementDeclarationAdapterFactory.java
@@ -12,9 +12,9 @@ package org.eclipse.wst.html.core.internal.modelquery;
 
 
 
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 
 /**
  */
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java
index b8dea12ead..42ddb16c6a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HMQUtil.java
@@ -15,7 +15,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Vector;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java
index 856d5d6d7e..8797f54b55 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLElementDeclarationAdapter.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.modelquery;
 
 
 
-import org.eclipse.wst.sse.core.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 
 /**
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java
index 97792ffc13..142ed624ed 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryCMProvider.java
@@ -16,11 +16,11 @@ import java.util.Hashtable;
 import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
 import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry;
 import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryCMProvider;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 import org.eclipse.wst.xml.uriresolver.util.IdResolver;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
index 14f94e003e..7c6fd2c416 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
@@ -14,13 +14,13 @@ package org.eclipse.wst.html.core.internal.modelquery;
 import java.util.List;
 import java.util.Vector;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
-import org.eclipse.wst.xml.core.document.IDOMElement;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.MovableModelQuery;
 import org.eclipse.wst.xml.uriresolver.util.IdResolver;
 import org.w3c.dom.Element;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java
index be38bcb988..c5fe198e0d 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForEmbeddedHTML.java
@@ -12,8 +12,8 @@ package org.eclipse.wst.html.core.internal.modelquery;
 
 
 
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
 
 public class ModelQueryAdapterFactoryForEmbeddedHTML extends ModelQueryAdapterFactoryForHTML {
@@ -36,7 +36,7 @@ public class ModelQueryAdapterFactoryForEmbeddedHTML extends ModelQueryAdapterFa
 	}
 
 	/**
-	 * @see org.eclipse.wst.sse.core.INodeAdapterFactory#adapt(INodeNotifier)
+	 * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory#adapt(INodeNotifier)
 	 */
 	public INodeAdapter adapt(INodeNotifier object) {
 		if (object == null)
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java
index a25888158d..fe53910e82 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/ModelQueryAdapterFactoryForHTML.java
@@ -18,17 +18,17 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.sse.core.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.IModelStateListener;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.eclipse.wst.sse.core.IStructuredModel;
+import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
 import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapterImpl;
 import org.eclipse.wst.xml.uriresolver.util.IdResolver;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTML40Namespace.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTML40Namespace.java
new file mode 100644
index 0000000000..9c944f0c26
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTML40Namespace.java
@@ -0,0 +1,675 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.html.core.internal.provisional;
+
+/**
+ * Provide all names defined in the HTML 4.0? specification.
+ */
+public interface HTML40Namespace {
+
+	// Element names
+	public static interface ElementName {
+		public static final String A = "A"; //$NON-NLS-1$
+		public static final String ABBR = "ABBR"; //$NON-NLS-1$
+		public static final String ACRONYM = "ACRONYM"; //$NON-NLS-1$
+		public static final String ADDRESS = "ADDRESS"; //$NON-NLS-1$
+		public static final String APPLET = "APPLET"; //$NON-NLS-1$
+		public static final String AREA = "AREA"; //$NON-NLS-1$
+		public static final String B = "B"; //$NON-NLS-1$
+		public static final String BASE = "BASE"; //$NON-NLS-1$
+		public static final String BASEFONT = "BASEFONT"; //$NON-NLS-1$
+		public static final String BDO = "BDO"; //$NON-NLS-1$
+		public static final String BGSOUND = "BGSOUND"; // D205513 //$NON-NLS-1$
+		public static final String BIG = "BIG"; //$NON-NLS-1$
+		public static final String BLINK = "BLINK"; //$NON-NLS-1$
+		public static final String BLOCKQUOTE = "BLOCKQUOTE"; //$NON-NLS-1$
+		public static final String BODY = "BODY"; //$NON-NLS-1$
+		public static final String BR = "BR"; //$NON-NLS-1$
+		public static final String BUTTON = "BUTTON"; //$NON-NLS-1$
+		public static final String CAPTION = "CAPTION"; //$NON-NLS-1$
+		public static final String CENTER = "CENTER"; //$NON-NLS-1$
+		public static final String CITE = "CITE"; //$NON-NLS-1$
+		public static final String CODE = "CODE"; //$NON-NLS-1$
+		public static final String COL = "COL"; //$NON-NLS-1$
+		public static final String COLGROUP = "COLGROUP"; //$NON-NLS-1$
+		public static final String DD = "DD"; //$NON-NLS-1$
+		public static final String DEL = "DEL"; //$NON-NLS-1$
+		public static final String DFN = "DFN"; //$NON-NLS-1$
+		public static final String DIR = "DIR"; //$NON-NLS-1$
+		public static final String DIV = "DIV"; //$NON-NLS-1$
+		public static final String DL = "DL"; //$NON-NLS-1$
+		public static final String DT = "DT"; //$NON-NLS-1$
+		public static final String EM = "EM"; //$NON-NLS-1$
+		public static final String EMBED = "EMBED"; //$NON-NLS-1$
+		public static final String FIELDSET = "FIELDSET"; //$NON-NLS-1$
+		public static final String FONT = "FONT"; //$NON-NLS-1$
+		public static final String FORM = "FORM"; //$NON-NLS-1$
+		public static final String FRAME = "FRAME"; //$NON-NLS-1$
+		public static final String FRAMESET = "FRAMESET"; //$NON-NLS-1$
+		public static final String H1 = "H1"; //$NON-NLS-1$
+		public static final String H2 = "H2"; //$NON-NLS-1$
+		public static final String H3 = "H3"; //$NON-NLS-1$
+		public static final String H4 = "H4"; //$NON-NLS-1$
+		public static final String H5 = "H5"; //$NON-NLS-1$
+		public static final String H6 = "H6"; //$NON-NLS-1$
+		public static final String HEAD = "HEAD"; //$NON-NLS-1$
+		public static final String HR = "HR"; //$NON-NLS-1$
+		public static final String HTML = "HTML"; //$NON-NLS-1$
+		public static final String I = "I"; //$NON-NLS-1$
+		public static final String IFRAME = "IFRAME"; //$NON-NLS-1$
+		public static final String IMG = "IMG"; //$NON-NLS-1$
+		public static final String INPUT = "INPUT"; //$NON-NLS-1$
+		public static final String INS = "INS"; //$NON-NLS-1$
+		public static final String ISINDEX = "ISINDEX"; //$NON-NLS-1$
+		public static final String KBD = "KBD"; //$NON-NLS-1$
+		public static final String LABEL = "LABEL"; //$NON-NLS-1$
+		public static final String LEGEND = "LEGEND"; //$NON-NLS-1$
+		public static final String LI = "LI"; //$NON-NLS-1$
+		public static final String LINK = "LINK"; //$NON-NLS-1$
+		public static final String MAP = "MAP"; //$NON-NLS-1$
+		public static final String MENU = "MENU"; //$NON-NLS-1$
+		public static final String META = "META"; //$NON-NLS-1$
+		public static final String NOBR = "NOBR"; // D205513 //$NON-NLS-1$
+		public static final String NOEMBED = "NOEMBED"; //$NON-NLS-1$
+		public static final String NOFRAMES = "NOFRAMES"; //$NON-NLS-1$
+		public static final String NOSCRIPT = "NOSCRIPT"; //$NON-NLS-1$
+		public static final String OBJECT = "OBJECT"; //$NON-NLS-1$
+		public static final String OL = "OL"; //$NON-NLS-1$
+		public static final String OPTGROUP = "OPTGROUP"; //$NON-NLS-1$
+		public static final String OPTION = "OPTION"; //$NON-NLS-1$
+		public static final String P = "P"; //$NON-NLS-1$
+		public static final String PARAM = "PARAM"; //$NON-NLS-1$
+		public static final String PRE = "PRE"; //$NON-NLS-1$
+		public static final String Q = "Q"; //$NON-NLS-1$
+		public static final String S = "S"; //$NON-NLS-1$
+		public static final String SAMP = "SAMP"; //$NON-NLS-1$
+		public static final String SCRIPT = "SCRIPT"; //$NON-NLS-1$
+		public static final String SELECT = "SELECT"; //$NON-NLS-1$
+		public static final String SMALL = "SMALL"; //$NON-NLS-1$
+		public static final String SPAN = "SPAN"; //$NON-NLS-1$
+		public static final String STRIKE = "STRIKE"; //$NON-NLS-1$
+		public static final String STRONG = "STRONG"; //$NON-NLS-1$
+		public static final String STYLE = "STYLE"; //$NON-NLS-1$
+		public static final String SUB = "SUB"; //$NON-NLS-1$
+		public static final String SUP = "SUP"; //$NON-NLS-1$
+		public static final String TABLE = "TABLE"; //$NON-NLS-1$
+		public static final String TBODY = "TBODY"; //$NON-NLS-1$
+		public static final String TD = "TD"; //$NON-NLS-1$
+		public static final String TEXTAREA = "TEXTAREA"; //$NON-NLS-1$
+		public static final String TFOOT = "TFOOT"; //$NON-NLS-1$
+		public static final String TH = "TH"; //$NON-NLS-1$
+		public static final String THEAD = "THEAD"; //$NON-NLS-1$
+		public static final String TITLE = "TITLE"; //$NON-NLS-1$
+		public static final String TR = "TR"; //$NON-NLS-1$
+		public static final String TT = "TT"; //$NON-NLS-1$
+		public static final String U = "U"; //$NON-NLS-1$
+		public static final String UL = "UL"; //$NON-NLS-1$
+		public static final String VAR = "VAR"; //$NON-NLS-1$
+		public static final String WBR = "WBR"; // D205513 //$NON-NLS-1$
+		public static final String MARQUEE = "MARQUEE"; //$NON-NLS-1$
+		public static final String SSI_CONFIG = "SSI:CONFIG"; // D210393 //$NON-NLS-1$
+		public static final String SSI_ECHO = "SSI:ECHO"; //$NON-NLS-1$
+		public static final String SSI_EXEC = "SSI:EXEC"; //$NON-NLS-1$
+		public static final String SSI_FSIZE = "SSI:FSIZE"; //$NON-NLS-1$
+		public static final String SSI_FLASTMOD = "SSI:FLASTMOD"; //$NON-NLS-1$
+		public static final String SSI_INCLUDE = "SSI:INCLUDE"; //$NON-NLS-1$
+		public static final String SSI_PRINTENV = "SSI:PRINTENV"; //$NON-NLS-1$
+		public static final String SSI_SET = "SSI:SET"; //$NON-NLS-1$
+		public static final String WML_WML = "wml"; //$NON-NLS-1$
+		public static final String WML_CARD = "card"; //$NON-NLS-1$
+		public static final String WML_TEMPLATE = "template"; //$NON-NLS-1$
+		public static final String WML_ACCESS = "access"; //$NON-NLS-1$
+		public static final String WML_DO = "do"; //$NON-NLS-1$
+		public static final String WML_ONEVENT = "onevent"; //$NON-NLS-1$
+		public static final String WML_TIMER = "timer"; //$NON-NLS-1$
+		public static final String WML_ANCHOR = "anchor"; //$NON-NLS-1$
+		public static final String WML_PREV = "prev"; //$NON-NLS-1$
+		public static final String WML_REFRESH = "refresh"; //$NON-NLS-1$
+		public static final String WML_GO = "go"; //$NON-NLS-1$
+		public static final String WML_NOOP = "noop"; //$NON-NLS-1$
+		public static final String WML_SETVAR = "setvar"; //$NON-NLS-1$
+		public static final String WML_POSTFIELD = "postfield"; //$NON-NLS-1$
+	}
+
+	// Character Entities
+	public static interface EntityName {
+		public static final String AACUTE_U = "Aacute"; //$NON-NLS-1$
+		public static final String AACUTE_L = "aacute"; //$NON-NLS-1$
+		public static final String ACIRC_U = "Acirc"; //$NON-NLS-1$
+		public static final String ACIRC_L = "acirc"; //$NON-NLS-1$
+		public static final String ACUTE = "acute"; //$NON-NLS-1$
+		public static final String AELIG_U = "AElig"; //$NON-NLS-1$
+		public static final String AELIG_L = "aelig"; //$NON-NLS-1$
+		public static final String AGRAVE_U = "Agrave"; //$NON-NLS-1$
+		public static final String AGRAVE_L = "agrave"; //$NON-NLS-1$
+		public static final String ALEFSYM = "alefsym"; //$NON-NLS-1$
+		public static final String ALPHA_U = "Alpha"; //$NON-NLS-1$
+		public static final String ALPHA_L = "alpha"; //$NON-NLS-1$
+		public static final String AMP = "amp"; //$NON-NLS-1$
+		public static final String AND = "and"; //$NON-NLS-1$
+		public static final String ANG = "ang"; //$NON-NLS-1$
+		public static final String ARING_U = "Aring"; //$NON-NLS-1$
+		public static final String ARING_L = "aring"; //$NON-NLS-1$
+		public static final String ASYMP = "asymp"; //$NON-NLS-1$
+		public static final String ATILDE_U = "Atilde"; //$NON-NLS-1$
+		public static final String ATILDE_L = "atilde"; //$NON-NLS-1$
+		public static final String AUML_U = "Auml"; //$NON-NLS-1$
+		public static final String AUML_L = "auml"; //$NON-NLS-1$
+		public static final String BDQUO = "bdquo"; //$NON-NLS-1$
+		public static final String BETA_U = "Beta"; //$NON-NLS-1$
+		public static final String BETA_L = "beta"; //$NON-NLS-1$
+		public static final String BRVBAR = "brvbar"; //$NON-NLS-1$
+		public static final String BULL = "bull"; //$NON-NLS-1$
+		public static final String CAP = "cap"; //$NON-NLS-1$
+		public static final String CCEDIL_U = "Ccedil"; //$NON-NLS-1$
+		public static final String CCEDIL_L = "ccedil"; //$NON-NLS-1$
+		public static final String CEDIL = "cedil"; //$NON-NLS-1$
+		public static final String CENT = "cent"; //$NON-NLS-1$
+		public static final String CHI_U = "Chi"; //$NON-NLS-1$
+		public static final String CHI_L = "chi"; //$NON-NLS-1$
+		public static final String CIRC = "circ"; //$NON-NLS-1$
+		public static final String CLUBS = "clubs"; //$NON-NLS-1$
+		public static final String CONG = "cong"; //$NON-NLS-1$
+		public static final String COPY = "copy"; //$NON-NLS-1$
+		public static final String CRARR = "crarr"; //$NON-NLS-1$
+		public static final String CUP = "cup"; //$NON-NLS-1$
+		public static final String CURREN = "curren"; //$NON-NLS-1$
+		public static final String DAGGER_U = "Dagger"; //$NON-NLS-1$
+		public static final String DAGGER_L = "dagger"; //$NON-NLS-1$
+		public static final String DARR_U = "dArr"; //$NON-NLS-1$
+		public static final String DARR_L = "darr"; //$NON-NLS-1$
+		public static final String DEG = "deg"; //$NON-NLS-1$
+		public static final String DELTA_U = "Delta"; //$NON-NLS-1$
+		public static final String DELTA_L = "delta"; //$NON-NLS-1$
+		public static final String DIAMS = "diams"; //$NON-NLS-1$
+		public static final String DIVIDE = "divide"; //$NON-NLS-1$
+		public static final String EACUTE_U = "Eacute"; //$NON-NLS-1$
+		public static final String EACUTE_L = "eacute"; //$NON-NLS-1$
+		public static final String ECIRC_U = "Ecirc"; //$NON-NLS-1$
+		public static final String ECIRC_L = "ecirc"; //$NON-NLS-1$
+		public static final String EGRAVE_U = "Egrave"; //$NON-NLS-1$
+		public static final String EGRAVE_L = "egrave"; //$NON-NLS-1$
+		public static final String EMPTY = "empty"; //$NON-NLS-1$
+		public static final String EMSP = "emsp"; //$NON-NLS-1$
+		public static final String ENSP = "ensp"; //$NON-NLS-1$
+		public static final String EPSILON_U = "Epsilon"; //$NON-NLS-1$
+		public static final String EPSILON_L = "epsilon"; //$NON-NLS-1$
+		public static final String EQUIV = "equiv"; //$NON-NLS-1$
+		public static final String ETA_U = "Eta"; //$NON-NLS-1$
+		public static final String ETA_L = "eta"; //$NON-NLS-1$
+		public static final String ETH_U = "ETH"; //$NON-NLS-1$
+		public static final String ETH_L = "eth"; //$NON-NLS-1$
+		public static final String EUML_U = "Euml"; //$NON-NLS-1$
+		public static final String EUML_L = "euml"; //$NON-NLS-1$
+		public static final String EURO = "euro"; //$NON-NLS-1$
+		public static final String EXIST = "exist"; //$NON-NLS-1$
+		public static final String FNOF = "fnof"; //$NON-NLS-1$
+		public static final String FORALL = "forall"; //$NON-NLS-1$
+		public static final String FRAC12 = "frac12"; //$NON-NLS-1$
+		public static final String FRAC14 = "frac14"; //$NON-NLS-1$
+		public static final String FRAC34 = "frac34"; //$NON-NLS-1$
+		public static final String FRASL = "frasl"; //$NON-NLS-1$
+		public static final String GAMMA_U = "Gamma"; //$NON-NLS-1$
+		public static final String GAMMA_L = "gamma"; //$NON-NLS-1$
+		public static final String GE = "ge"; //$NON-NLS-1$
+		public static final String GT = "gt"; //$NON-NLS-1$
+		public static final String HARR_U = "hArr"; //$NON-NLS-1$
+		public static final String HARR_L = "harr"; //$NON-NLS-1$
+		public static final String HEARTS = "hearts"; //$NON-NLS-1$
+		public static final String HELLIP = "hellip"; //$NON-NLS-1$
+		public static final String IACUTE_U = "Iacute"; //$NON-NLS-1$
+		public static final String IACUTE_L = "iacute"; //$NON-NLS-1$
+		public static final String ICIRC_U = "Icirc"; //$NON-NLS-1$
+		public static final String ICIRC_L = "icirc"; //$NON-NLS-1$
+		public static final String IEXCL = "iexcl"; //$NON-NLS-1$
+		public static final String IGRAVE_U = "Igrave"; //$NON-NLS-1$
+		public static final String IGRAVE_L = "igrave"; //$NON-NLS-1$
+		public static final String IMAGE = "image"; //$NON-NLS-1$
+		public static final String INFIN = "infin"; //$NON-NLS-1$
+		public static final String INT = "int"; //$NON-NLS-1$
+		public static final String IOTA_U = "Iota"; //$NON-NLS-1$
+		public static final String IOTA_L = "iota"; //$NON-NLS-1$
+		public static final String IQUEST = "iquest"; //$NON-NLS-1$
+		public static final String ISIN = "isin"; //$NON-NLS-1$
+		public static final String IUML_U = "Iuml"; //$NON-NLS-1$
+		public static final String IUML_L = "iuml"; //$NON-NLS-1$
+		public static final String KAPPA_U = "Kappa"; //$NON-NLS-1$
+		public static final String KAPPA_L = "kappa"; //$NON-NLS-1$
+		public static final String LAMBDA_U = "Lambda"; //$NON-NLS-1$
+		public static final String LAMBDA_L = "lambda"; //$NON-NLS-1$
+		public static final String LANG = "lang"; //$NON-NLS-1$
+		public static final String LAQUO = "laquo"; //$NON-NLS-1$
+		public static final String LARR_U = "lArr"; //$NON-NLS-1$
+		public static final String LARR_L = "larr"; //$NON-NLS-1$
+		public static final String LCEIL = "lceil"; //$NON-NLS-1$
+		public static final String LDQUO = "ldquo"; //$NON-NLS-1$
+		public static final String LE = "le"; //$NON-NLS-1$
+		public static final String LFLOOR = "lfloor"; //$NON-NLS-1$
+		public static final String LOWAST = "lowast"; //$NON-NLS-1$
+		public static final String LOZ = "loz"; //$NON-NLS-1$
+		public static final String LRM = "lrm"; //$NON-NLS-1$
+		public static final String LSAQUO = "lsaquo"; //$NON-NLS-1$
+		public static final String LSQUO = "lsquo"; //$NON-NLS-1$
+		public static final String LT = "lt"; //$NON-NLS-1$
+		public static final String MACR = "macr"; //$NON-NLS-1$
+		public static final String MDASH = "mdash"; //$NON-NLS-1$
+		public static final String MICRO = "micro"; //$NON-NLS-1$
+		public static final String MIDDOT = "middot"; //$NON-NLS-1$
+		public static final String MINUS = "minus"; //$NON-NLS-1$
+		public static final String MU_U = "Mu"; //$NON-NLS-1$
+		public static final String MU_L = "mu"; //$NON-NLS-1$
+		public static final String NABLA = "nabla"; //$NON-NLS-1$
+		public static final String NBSP = "nbsp"; //$NON-NLS-1$
+		public static final String NDASH = "ndash"; //$NON-NLS-1$
+		public static final String NE = "ne"; //$NON-NLS-1$
+		public static final String NI = "ni"; //$NON-NLS-1$
+		public static final String NOT = "not"; //$NON-NLS-1$
+		public static final String NOTIN = "notin"; //$NON-NLS-1$
+		public static final String NSUB = "nsub"; //$NON-NLS-1$
+		public static final String NTILDE_U = "Ntilde"; //$NON-NLS-1$
+		public static final String NTILDE_L = "ntilde"; //$NON-NLS-1$
+		public static final String NU_U = "Nu"; //$NON-NLS-1$
+		public static final String NU_L = "nu"; //$NON-NLS-1$
+		public static final String OACUTE_U = "Oacute"; //$NON-NLS-1$
+		public static final String OACUTE_L = "oacute"; //$NON-NLS-1$
+		public static final String OCIRC_U = "Ocirc"; //$NON-NLS-1$
+		public static final String OCIRC_L = "ocirc"; //$NON-NLS-1$
+		public static final String OELIG_U = "OElig"; //$NON-NLS-1$
+		public static final String OELIG_L = "oelig"; //$NON-NLS-1$
+		public static final String OGRAVE_U = "Ograve"; //$NON-NLS-1$
+		public static final String OGRAVE_L = "ograve"; //$NON-NLS-1$
+		public static final String OLINE = "oline"; //$NON-NLS-1$
+		public static final String OMEGA_U = "Omega"; //$NON-NLS-1$
+		public static final String OMEGA_L = "omega"; //$NON-NLS-1$
+		public static final String OMICRON_U = "Omicron"; //$NON-NLS-1$
+		public static final String OMICRON_L = "omicron"; //$NON-NLS-1$
+		public static final String OPLUS = "oplus"; //$NON-NLS-1$
+		public static final String OR = "or"; //$NON-NLS-1$
+		public static final String ORDF = "ordf"; //$NON-NLS-1$
+		public static final String ORDM = "ordm"; //$NON-NLS-1$
+		public static final String OSLASH_U = "Oslash"; //$NON-NLS-1$
+		public static final String OSLASH_L = "oslash"; //$NON-NLS-1$
+		public static final String OTILDE_U = "Otilde"; //$NON-NLS-1$
+		public static final String OTILDE_L = "otilde"; //$NON-NLS-1$
+		public static final String OTIMES = "otimes"; //$NON-NLS-1$
+		public static final String OUML_U = "Ouml"; //$NON-NLS-1$
+		public static final String OUML_L = "ouml"; //$NON-NLS-1$
+		public static final String PARA = "para"; //$NON-NLS-1$
+		public static final String PART = "part"; //$NON-NLS-1$
+		public static final String PERMIL = "permil"; //$NON-NLS-1$
+		public static final String PERP = "perp"; //$NON-NLS-1$
+		public static final String PHI_U = "Phi"; //$NON-NLS-1$
+		public static final String PHI_L = "phi"; //$NON-NLS-1$
+		public static final String PI_U = "Pi"; //$NON-NLS-1$
+		public static final String PI_L = "pi"; //$NON-NLS-1$
+		public static final String PIV = "piv"; //$NON-NLS-1$
+		public static final String PLUSMN = "plusmn"; //$NON-NLS-1$
+		public static final String POUND = "pound"; //$NON-NLS-1$
+		public static final String PRIME_U = "Prime"; //$NON-NLS-1$
+		public static final String PRIME_L = "prime"; //$NON-NLS-1$
+		public static final String PROD = "prod"; //$NON-NLS-1$
+		public static final String PROP = "prop"; //$NON-NLS-1$
+		public static final String PSI_U = "Psi"; //$NON-NLS-1$
+		public static final String PSI_L = "psi"; //$NON-NLS-1$
+		public static final String QUOT = "quot"; //$NON-NLS-1$
+		public static final String RADIC = "radic"; //$NON-NLS-1$
+		public static final String RANG = "rang"; //$NON-NLS-1$
+		public static final String RAQUO = "raquo"; //$NON-NLS-1$
+		public static final String RARR_U = "rArr"; //$NON-NLS-1$
+		public static final String RARR_L = "rarr"; //$NON-NLS-1$
+		public static final String RCEIL = "rceil"; //$NON-NLS-1$
+		public static final String RDQUO = "rdquo"; //$NON-NLS-1$
+		public static final String REAL = "real"; //$NON-NLS-1$
+		public static final String REG = "reg"; //$NON-NLS-1$
+		public static final String RFLOOR = "rfloor"; //$NON-NLS-1$
+		public static final String RHO_U = "Rho"; //$NON-NLS-1$
+		public static final String RHO_L = "rho"; //$NON-NLS-1$
+		public static final String RLM = "rlm"; //$NON-NLS-1$
+		public static final String RSAQUO = "rsaquo"; //$NON-NLS-1$
+		public static final String RSQUO = "rsquo"; //$NON-NLS-1$
+		public static final String SBQUO = "sbquo"; //$NON-NLS-1$
+		public static final String SCARON_U = "Scaron"; //$NON-NLS-1$
+		public static final String SCARON_L = "scaron"; //$NON-NLS-1$
+		public static final String SDOT = "sdot"; //$NON-NLS-1$
+		public static final String SECT = "sect"; //$NON-NLS-1$
+		public static final String SHY = "shy"; //$NON-NLS-1$
+		public static final String SIGMA_U = "Sigma"; //$NON-NLS-1$
+		public static final String SIGMA_L = "sigma"; //$NON-NLS-1$
+		public static final String SIGMAF = "sigmaf"; //$NON-NLS-1$
+		public static final String SIM = "sim"; //$NON-NLS-1$
+		public static final String SPADES = "spades"; //$NON-NLS-1$
+		public static final String SUB = "sub"; //$NON-NLS-1$
+		public static final String SUBE = "sube"; //$NON-NLS-1$
+		public static final String SUM = "sum"; //$NON-NLS-1$
+		public static final String SUP = "sup"; //$NON-NLS-1$
+		public static final String SUP1 = "sup1"; //$NON-NLS-1$
+		public static final String SUP2 = "sup2"; //$NON-NLS-1$
+		public static final String SUP3 = "sup3"; //$NON-NLS-1$
+		public static final String SUPE = "supe"; //$NON-NLS-1$
+		public static final String SZLIG = "szlig"; //$NON-NLS-1$
+		public static final String TAU_U = "Tau"; //$NON-NLS-1$
+		public static final String TAU_L = "tau"; //$NON-NLS-1$
+		public static final String THERE4 = "there4"; //$NON-NLS-1$
+		public static final String THETA_U = "Theta"; //$NON-NLS-1$
+		public static final String THETA_L = "theta"; //$NON-NLS-1$
+		public static final String THETASYM = "thetasym"; //$NON-NLS-1$
+		public static final String THINSP = "thinsp"; //$NON-NLS-1$
+		public static final String THORN_U = "THORN"; //$NON-NLS-1$
+		public static final String THORN_L = "thorn"; //$NON-NLS-1$
+		public static final String TILDE = "tilde"; //$NON-NLS-1$
+		public static final String TIMES = "times"; //$NON-NLS-1$
+		public static final String TRADE = "trade"; //$NON-NLS-1$
+		public static final String UACUTE_U = "Uacute"; //$NON-NLS-1$
+		public static final String UACUTE_L = "uacute"; //$NON-NLS-1$
+		public static final String UARR_U = "uArr"; //$NON-NLS-1$
+		public static final String UARR_L = "uarr"; //$NON-NLS-1$
+		public static final String UCIRC_U = "Ucirc"; //$NON-NLS-1$
+		public static final String UCIRC_L = "ucirc"; //$NON-NLS-1$
+		public static final String UGRAVE_U = "Ugrave"; //$NON-NLS-1$
+		public static final String UGRAVE_L = "ugrave"; //$NON-NLS-1$
+		public static final String UML = "uml"; //$NON-NLS-1$
+		public static final String UPSIH = "upsih"; //$NON-NLS-1$
+		public static final String UPSILON_U = "Upsilon"; //$NON-NLS-1$
+		public static final String UPSILON_L = "upsilon"; //$NON-NLS-1$
+		public static final String UUML_U = "Uuml"; //$NON-NLS-1$
+		public static final String UUML_L = "uuml"; //$NON-NLS-1$
+		public static final String WEIERP = "weierp"; //$NON-NLS-1$
+		public static final String XI_U = "Xi"; //$NON-NLS-1$
+		public static final String XI_L = "xi"; //$NON-NLS-1$
+		public static final String YACUTE_U = "Yacute"; //$NON-NLS-1$
+		public static final String YACUTE_L = "yacute"; //$NON-NLS-1$
+		public static final String YEN = "yen"; //$NON-NLS-1$
+		public static final String YUML_U = "Yuml"; //$NON-NLS-1$
+		public static final String YUML_L = "yuml"; //$NON-NLS-1$
+		public static final String ZETA_U = "Zeta"; //$NON-NLS-1$
+		public static final String ZETA_L = "zeta"; //$NON-NLS-1$
+		public static final String ZWJ = "zwj"; //$NON-NLS-1$
+		public static final String ZWNJ = "zwnj"; //$NON-NLS-1$
+	}
+
+	public static final String HTML40_URI = "http://www.w3.org/TR/REC-html40/frameset.dtd"; //$NON-NLS-1$
+	public static final String HTML40_TAG_PREFIX = ""; //$NON-NLS-1$
+	// global attribute names
+	public static final String ATTR_NAME_ID = "id"; // %coreattrs; //$NON-NLS-1$
+	public static final String ATTR_NAME_CLASS = "class"; // %coreattrs; //$NON-NLS-1$
+	public static final String ATTR_NAME_STYLE = "style"; // %coreattrs; //$NON-NLS-1$
+	public static final String ATTR_NAME_TITLE = "title"; // %coreattrs; //$NON-NLS-1$
+	public static final String ATTR_NAME_LANG = "lang"; // %i18n; //$NON-NLS-1$
+	public static final String ATTR_NAME_DIR = "dir"; // %i18n; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONCLICK = "onclick"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONDBLCLICK = "ondblclick"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONMOUSEDOWN = "onmousedown"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONMOUSEUP = "onmouseup"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONMOUSEOVER = "onmouseover"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONMOUSEMOVE = "onmousemove"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONMOUSEOUT = "onmouseout"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONKEYPRESS = "onkeypress"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONKEYDOWN = "onkeydown"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONKEYUP = "onkeyup"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_ONHELP = "onhelp"; // %events; //$NON-NLS-1$
+	public static final String ATTR_NAME_BGCOLOR = "bgcolor"; // %bodycolor;, TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_TEXT = "text"; // %bodycolor; //$NON-NLS-1$
+	public static final String ATTR_NAME_LINK = "link"; // %bodycolor; //$NON-NLS-1$
+	public static final String ATTR_NAME_VLINK = "vlink"; // %bodycolor; //$NON-NLS-1$
+	public static final String ATTR_NAME_ALINK = "alink"; // %bodycolor; //$NON-NLS-1$
+	public static final String ATTR_NAME_VERSION = "version"; // HTML //$NON-NLS-1$
+	public static final String ATTR_NAME_PROFILE = "profile"; // HEAD //$NON-NLS-1$
+	public static final String ATTR_NAME_ONLOAD = "onload"; // BODY //$NON-NLS-1$
+	public static final String ATTR_NAME_ONUNLOAD = "onunload"; // BODY //$NON-NLS-1$
+	public static final String ATTR_NAME_BACKGROUND = "background"; // BODY, TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_SRC = "src"; // IMG //$NON-NLS-1$
+	public static final String ATTR_NAME_ALT = "alt"; // IMG,AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_LONGDESC = "longdesc"; // IMG //$NON-NLS-1$
+	public static final String ATTR_NAME_NAME = "name"; // IMG //$NON-NLS-1$
+	public static final String ATTR_NAME_HEIGHT = "height"; // IMG, TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_WIDTH = "width"; // IMG, TABLE,HR //$NON-NLS-1$
+	public static final String ATTR_NAME_USEMAP = "usemap"; // IMG //$NON-NLS-1$
+	public static final String ATTR_NAME_ISMAP = "ismap"; // IMG //$NON-NLS-1$
+	public static final String ATTR_NAME_ALIGN = "align"; // IMG, TABLE,HR //$NON-NLS-1$
+	public static final String ATTR_NAME_BORDER = "border"; // IMG, TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_HSPACE = "hspace"; // IMG //$NON-NLS-1$
+	public static final String ATTR_NAME_VSPACE = "vspace"; // IMG //$NON-NLS-1$
+	public static final String ATTR_NAME_MAPFILE = "mapfile"; // IMG //$NON-NLS-1$
+	public static final String ATTR_NAME_SUMMARY = "summary"; // TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_FRAME = "frame"; // TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_RULES = "rules"; // TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_CELLSPACING = "cellspacing"; // TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_CELLPADDING = "cellpadding"; // TABLE //$NON-NLS-1$
+	public static final String ATTR_NAME_DATAPAGESIZE = "datapagesize"; // TABLE,HR //$NON-NLS-1$
+	public static final String ATTR_NAME_COLOR = "color"; // BASEFONT,FONT //$NON-NLS-1$
+	public static final String ATTR_NAME_FACE = "face"; // BASEFONT,FONT //$NON-NLS-1$
+	public static final String ATTR_NAME_SIZE = "size"; // BASEFONT,FONT //$NON-NLS-1$
+	public static final String ATTR_NAME_CLEAR = "clear"; // BR //$NON-NLS-1$
+	public static final String ATTR_NAME_SHAPE = "shape"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_COORDS = "coords"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_HREF = "href"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_TARGET = "target"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_NOHREF = "nohref"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_TABINDEX = "tabindex"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_ACCESSKEY = "accesskey"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_ONFOCUS = "onfocus"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_ONBLUR = "onblur"; // AREA //$NON-NLS-1$
+	public static final String ATTR_NAME_CHARSET = "charset"; // LINK //$NON-NLS-1$
+	public static final String ATTR_NAME_HREFLANG = "hreflang"; // LINK //$NON-NLS-1$
+	public static final String ATTR_NAME_TYPE = "type"; // LINK //$NON-NLS-1$
+	public static final String ATTR_NAME_REL = "rel"; // LINK //$NON-NLS-1$
+	public static final String ATTR_NAME_REV = "rev"; // LINK //$NON-NLS-1$
+	public static final String ATTR_NAME_MEDIA = "media"; // LINK //$NON-NLS-1$
+	public static final String ATTR_NAME_VALUE = "value"; // PARAM //$NON-NLS-1$
+	public static final String ATTR_NAME_VALUETYPE = "valuetype"; // PARAM //$NON-NLS-1$
+	public static final String ATTR_NAME_NOSHADE = "noshade"; // HR //$NON-NLS-1$
+	public static final String ATTR_NAME_CHECKED = "checked"; // INPUT //$NON-NLS-1$
+	public static final String ATTR_NAME_DISABLED = "disabled"; // INPUT //$NON-NLS-1$
+	public static final String ATTR_NAME_READONLY = "readonly"; // INPUT //$NON-NLS-1$
+	public static final String ATTR_NAME_MAXLENGTH = "maxlength"; // INPUT //$NON-NLS-1$
+	public static final String ATTR_NAME_ONSELECT = "onselect"; // INPUT //$NON-NLS-1$
+	public static final String ATTR_NAME_ONCHANGE = "onchange"; // INPUT //$NON-NLS-1$
+	public static final String ATTR_NAME_ACCEPT = "accept"; // INPUT //$NON-NLS-1$
+	public static final String ATTR_NAME_ISTYLE = "istyle"; // INPUT //$NON-NLS-1$
+	public static final String ATTR_NAME_CHAR = "char"; // COL //$NON-NLS-1$
+	public static final String ATTR_NAME_CHAROFF = "charoff"; // COL //$NON-NLS-1$
+	public static final String ATTR_NAME_VALIGN = "valign"; // COL //$NON-NLS-1$
+	public static final String ATTR_NAME_SPAN = "span"; // COL //$NON-NLS-1$
+	public static final String ATTR_NAME_FRAMEBORDER = "frameborder"; // FRAME //$NON-NLS-1$
+	public static final String ATTR_NAME_MARGINWIDTH = "marginwidth"; // FRAME //$NON-NLS-1$
+	public static final String ATTR_NAME_MARGINHEIGHT = "marginheight"; // FRAME //$NON-NLS-1$
+	public static final String ATTR_NAME_NORESIZE = "noresize"; // FRAME //$NON-NLS-1$
+	public static final String ATTR_NAME_SCROLLING = "scrolling"; // FRAME //$NON-NLS-1$
+	public static final String ATTR_NAME_PROMPT = "prompt"; // ISINDEX //$NON-NLS-1$
+	public static final String ATTR_NAME_HTTP_EQUIV = "http-equiv"; // META //$NON-NLS-1$
+	public static final String ATTR_NAME_CONTENT = "content"; // META //$NON-NLS-1$
+	public static final String ATTR_NAME_SCHEME = "scheme"; // META //$NON-NLS-1$
+	public static final String ATTR_NAME_ERRMSG = "errmsg"; // ssi:config //$NON-NLS-1$
+	public static final String ATTR_NAME_SIZEFMT = "sizefmt"; // ssi:config //$NON-NLS-1$
+	public static final String ATTR_NAME_TIMEFMT = "timefmt"; // ssi:config //$NON-NLS-1$
+	public static final String ATTR_NAME_VAR = "var"; // ssi:echo //$NON-NLS-1$
+	public static final String ATTR_NAME_CGI = "cgi"; // ssi:exec //$NON-NLS-1$
+	public static final String ATTR_NAME_CMD = "cmd"; // ssi:exec //$NON-NLS-1$
+	public static final String ATTR_NAME_FILE = "file"; // ssi:fsize //$NON-NLS-1$
+	public static final String ATTR_NAME_VIRTUAL = "virtual"; // ssi:fsize //$NON-NLS-1$
+	public static final String ATTR_NAME_SELECTED = "selected"; // OPTION //$NON-NLS-1$
+	public static final String ATTR_NAME_LABEL = "label"; // OPTION //$NON-NLS-1$
+	public static final String ATTR_NAME_ROWS = "rows"; // TEXTAREA //$NON-NLS-1$
+	public static final String ATTR_NAME_COLS = "cols"; // TEXTAREA //$NON-NLS-1$
+	public static final String ATTR_NAME_LANGUAGE = "language"; // SCRIPT //$NON-NLS-1$
+	public static final String ATTR_NAME_DEFER = "defer"; // SCRIPT //$NON-NLS-1$
+	public static final String ATTR_NAME_EVENT = "event"; // SCRIPT //$NON-NLS-1$
+	public static final String ATTR_NAME_FOR = "for"; // SCRIPT //$NON-NLS-1$
+	public static final String ATTR_NAME_COMPACT = "compact"; // OL/UL //$NON-NLS-1$
+	public static final String ATTR_NAME_START = "start"; // OL/UL //$NON-NLS-1$
+	public static final String ATTR_NAME_DIRECTKEY = "directkey"; // A //$NON-NLS-1$
+	public static final String ATTR_NAME_CODEBASE = "codebase"; // APPLET //$NON-NLS-1$
+	public static final String ATTR_NAME_ARCHIVE = "archive"; // APPLET //$NON-NLS-1$
+	public static final String ATTR_NAME_CODE = "code"; // APPLET //$NON-NLS-1$
+	public static final String ATTR_NAME_OBJECT = "object"; // APPLET //$NON-NLS-1$
+	public static final String ATTR_NAME_MAYSCRIPT = "mayscript"; // APPLET //$NON-NLS-1$
+	public static final String ATTR_NAME_CITE = "cite"; // BLOCKQUOTE //$NON-NLS-1$
+	public static final String ATTR_NAME_MACRO = "macro"; // D2W //$NON-NLS-1$
+	public static final String ATTR_NAME_DATETIME = "datetime"; // INS/DEL //$NON-NLS-1$
+	public static final String ATTR_NAME_LOOP = "loop"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_HIDDEN = "hidden"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_VOLUME = "volume"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_AUTOSTART = "autostart"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_AUTOPLAY = "autoplay"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_AUTOSIZE = "autosize"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_CONTROLLER = "controller";// EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_SCALE = "scale"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_SHOWCONTROLS = "showcontrols";// EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_PLAYCOUNT = "playcount"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_REPEAT = "repeat"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_PANEL = "panel"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_PALETTE = "palette"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_TEXTFOCUS = "textfocus"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_NAME_ACTION = "action"; // FORM //$NON-NLS-1$
+	public static final String ATTR_NAME_METHOD = "method"; // FORM //$NON-NLS-1$
+	public static final String ATTR_NAME_ENCTYPE = "enctype"; // FORM //$NON-NLS-1$
+	public static final String ATTR_NAME_ONSUBMIT = "onsubmit"; // FORM //$NON-NLS-1$
+	public static final String ATTR_NAME_ONRESET = "onreset"; // FORM //$NON-NLS-1$
+	public static final String ATTR_NAME_ACCEPT_CHARSET = "accept-charset";// FORM //$NON-NLS-1$
+	public static final String ATTR_NAME_BEHAVIOR = "behavior"; // MARQUEE //$NON-NLS-1$
+	public static final String ATTR_NAME_DIRECTION = "direction"; // MARQUEE //$NON-NLS-1$
+	public static final String ATTR_NAME_SCROLLAMOUNT = "scrollamount";// MARQUEE //$NON-NLS-1$
+	public static final String ATTR_NAME_SCROLLDELAY = "scrolldelay";// MARQUEE //$NON-NLS-1$
+	public static final String ATTR_NAME_TRUESPEED = "truespeed"; // MARQUEE //$NON-NLS-1$
+	public static final String ATTR_NAME_DECLARE = "declare"; // OBJECT //$NON-NLS-1$
+	public static final String ATTR_NAME_CLASSID = "classid"; // OBJECT //$NON-NLS-1$
+	public static final String ATTR_NAME_DATA = "data"; // OBJECT //$NON-NLS-1$
+	public static final String ATTR_NAME_CODETYPE = "codetype"; // OBJECT //$NON-NLS-1$
+	public static final String ATTR_NAME_STANDBY = "standby"; // OBJECT //$NON-NLS-1$
+	public static final String ATTR_NAME_MULTIPLE = "multiple"; // SELECT //$NON-NLS-1$
+	public static final String ATTR_NAME_ABBR = "abbr"; // TH/TD //$NON-NLS-1$
+	public static final String ATTR_NAME_AXIS = "axis"; // TH/TD //$NON-NLS-1$
+	public static final String ATTR_NAME_HEADERS = "headers"; // TH/TD //$NON-NLS-1$
+	public static final String ATTR_NAME_SCOPE = "scope"; // TH/TD //$NON-NLS-1$
+	public static final String ATTR_NAME_ROWSPAN = "rowspan"; // TH/TD //$NON-NLS-1$
+	public static final String ATTR_NAME_COLSPAN = "colspan"; // TH/TD //$NON-NLS-1$
+	public static final String ATTR_NAME_NOWRAP = "nowrap"; // TH/TD //$NON-NLS-1$
+	// <<D205514
+	public static final String ATTR_NAME_TOPMARGIN = "topmargin"; // BODY //$NON-NLS-1$
+	public static final String ATTR_NAME_BOTTOMMARGIN = "bottommargin"; // BODY //$NON-NLS-1$
+	public static final String ATTR_NAME_LEFTMARGIN = "leftmargin"; // BODY //$NON-NLS-1$
+	public static final String ATTR_NAME_RIGHTMARGIN = "rightmargin"; // BODY //$NON-NLS-1$
+	public static final String ATTR_NAME_BORDERCOLOR = "bordercolor"; // TABLE/TR/TH/TD/FRAMESET/FRAME //$NON-NLS-1$
+	// for WML
+	public static final String WML_ATTR_NAME_TITLE = "title"; // card //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_DOMAIN = "domain"; // access //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_PATH = "path"; // access //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_ONENTERFORWARD = "onenterforward"; // template,card //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_ONENTERBACKWARD = "onenterbackward"; // template,card //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_ONPICK = "onpick"; // option //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_ONTIMER = "ontimer"; // template,card //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_NEWCONTEXT = "newcontext"; // card //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_ORDERED = "ordered"; // card //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_OPTIONAL = "optional"; // do //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_CACHE_CONTROL = "cache-control"; // go //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_SENDREFERER = "sendreferer"; // go //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_METHOD = "method"; // go //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_ENCTYPE = "enctype"; // go //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_ACCEPT_CHARSET = "accept-charset"; // go //$NON-NLS-1$
+	public static final String WML_ATTR_NAME_COLUMNS = "columns"; // table //$NON-NLS-1$	
+	// D205514
+	//<<D215684
+	public static final String ATTR_NAME_FRAMESPACING = "framespacing"; // FRAMESET //$NON-NLS-1$
+	//D215684
+	// global attribute values; mainly used in enumeration.
+	public static final String ATTR_VALUE_VERSION_TRANSITIONAL = "-//W3C//DTD HTML 4.01 Transitional//EN"; //$NON-NLS-1$
+	public static final String ATTR_VALUE_VERSION_FRAMESET = "-//W3C//DTD HTML 4.01 Frameset//EN"; //$NON-NLS-1$
+	public static final String ATTR_VALUE_LTR = "ltr"; // dir //$NON-NLS-1$
+	public static final String ATTR_VALUE_RTL = "rtl"; // dir //$NON-NLS-1$
+	//   for align (top|middle|bottom|left|right)
+	public static final String ATTR_VALUE_TOP = "top"; // align //$NON-NLS-1$
+	public static final String ATTR_VALUE_MIDDLE = "middle"; // align //$NON-NLS-1$
+	public static final String ATTR_VALUE_BOTTOM = "bottom"; // align //$NON-NLS-1$
+	public static final String ATTR_VALUE_LEFT = "left"; // align //$NON-NLS-1$
+	public static final String ATTR_VALUE_CENTER = "center"; // align //$NON-NLS-1$
+	public static final String ATTR_VALUE_RIGHT = "right"; // align //$NON-NLS-1$
+	public static final String ATTR_VALUE_JUSTIFY = "justify"; // align //$NON-NLS-1$
+	public static final String ATTR_VALUE_CHAR = "char"; // align //$NON-NLS-1$
+	//   for valign (baseline)
+	public static final String ATTR_VALUE_BASELINE = "baseline"; // valign //$NON-NLS-1$
+	//   for clear (left|all|right|none): left and right are already defined above.
+	public static final String ATTR_VALUE_ALL = "all"; // clear //$NON-NLS-1$
+	public static final String ATTR_VALUE_NONE = "none"; // clear //$NON-NLS-1$
+	//   for shape (rect|circle|poly|default)
+	public static final String ATTR_VALUE_RECT = "rect"; // shape //$NON-NLS-1$
+	public static final String ATTR_VALUE_CIRCLE = "circle"; // shape //$NON-NLS-1$
+	public static final String ATTR_VALUE_POLY = "poly"; // shape //$NON-NLS-1$
+	public static final String ATTR_VALUE_DEFAULT = "default"; // shape //$NON-NLS-1$
+	//   for valuetype (data|ref|object)
+	public static final String ATTR_VALUE_DATA = "data"; // valuetype //$NON-NLS-1$
+	public static final String ATTR_VALUE_REF = "ref"; // valuetype //$NON-NLS-1$
+	public static final String ATTR_VALUE_OBJECT = "object"; // valuetype //$NON-NLS-1$
+	//   for type of INPUT
+	//       (text | password | checkbox | radio | submit | reset |
+	//        file | hidden | image | button)
+	public static final String ATTR_VALUE_TEXT = "text"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_PASSWORD = "password"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_CHECKBOX = "checkbox"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_RADIO = "radio"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_SUBMIT = "submit"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_RESET = "reset"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_FILE = "file"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_HIDDEN = "hidden"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_IMAGE = "image"; // INPUT:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_BUTTON = "button"; // INPUT:type //$NON-NLS-1$
+	//   for span, colspan, rowspan
+	public static final String ATTR_VALUE_1 = "1"; // span //$NON-NLS-1$
+	//   for frameborder
+	public static final String ATTR_VALUE_0 = "0"; // FRAME //$NON-NLS-1$
+	//   for scrolling
+	public static final String ATTR_VALUE_YES = "yes"; // FRAME //$NON-NLS-1$
+	public static final String ATTR_VALUE_NO = "no"; // FRAME //$NON-NLS-1$
+	public static final String ATTR_VALUE_AUTO = "auto"; // FRAME //$NON-NLS-1$
+	//   for UL
+	public static final String ATTR_VALUE_DISC = "disc"; // UL:type //$NON-NLS-1$
+	public static final String ATTR_VALUE_SQUARE = "square"; // UL:type //$NON-NLS-1$
+	//   for frame of TABLE
+	public static final String ATTR_VALUE_VOID = "void"; // TABLE:frame //$NON-NLS-1$
+	public static final String ATTR_VALUE_ABOVE = "above"; // TABLE:frame //$NON-NLS-1$
+	public static final String ATTR_VALUE_BELOW = "below"; // TABLE:frame //$NON-NLS-1$
+	public static final String ATTR_VALUE_HSIDES = "hsides"; // TABLE:frame //$NON-NLS-1$
+	public static final String ATTR_VALUE_LHS = "lhs"; // TABLE:frame //$NON-NLS-1$
+	public static final String ATTR_VALUE_RHS = "rhs"; // TABLE:frame //$NON-NLS-1$
+	public static final String ATTR_VALUE_VSIDES = "vsides"; // TABLE:frame //$NON-NLS-1$
+	public static final String ATTR_VALUE_BOX = "box"; // TABLE:frame //$NON-NLS-1$
+	public static final String ATTR_VALUE_BORDER = "border"; // TABLE:frame //$NON-NLS-1$
+	//   for rules of TABLE
+	public static final String ATTR_VALUE_GROUPS = "groups"; // TABLE:rules //$NON-NLS-1$
+	public static final String ATTR_VALUE_ROWS = "rows"; // TEXTAREA //$NON-NLS-1$
+	public static final String ATTR_VALUE_COLS = "cols"; // TEXTAREA //$NON-NLS-1$
+	//   for method of FORM
+	public static final String ATTR_VALUE_GET = "get"; // FORM //$NON-NLS-1$
+	public static final String ATTR_VALUE_POST = "post"; // FORM //$NON-NLS-1$
+	public static final String ATTR_VALUE_WWW_FORM_URLENCODED = "application/x-www-form-urlencoded"; //$NON-NLS-1$
+	//   for scope of (TH | TD)
+	public static final String ATTR_VALUE_ROW = "row"; // (TH|TD):scope //$NON-NLS-1$
+	public static final String ATTR_VALUE_COL = "col"; // (TH|TD):scope //$NON-NLS-1$
+	public static final String ATTR_VALUE_ROWGROUP = "rowgroup";// (TH|TD):scope //$NON-NLS-1$
+	public static final String ATTR_VALUE_COLGROUP = "colgroup";// (TH|TD):scope //$NON-NLS-1$
+	//   for auto?? of EMBED
+	public static final String ATTR_VALUE_TRUE = "true"; // EMBED //$NON-NLS-1$
+	public static final String ATTR_VALUE_FALSE = "false"; // EMBED //$NON-NLS-1$
+	//   for behaviro of MARQUEE
+	public static final String ATTR_VALUE_SCROLL = "scroll"; // MARQUEE //$NON-NLS-1$
+	public static final String ATTR_VALUE_SLIDE = "slide"; // MARQUEE //$NON-NLS-1$
+	public static final String ATTR_VALUE_ALTERNATE = "alternate"; // MARQUEE //$NON-NLS-1$
+	//   for direction of MARQUEE
+	public static final String ATTR_VALUE_UP = "up"; // MARQUEE //$NON-NLS-1$
+	public static final String ATTR_VALUE_DOWN = "down"; // MARQUEE //$NON-NLS-1$
+	//   for type of LI (D19924)
+	public static final String ATTR_VALUE_NUMBER = "1"; // LI //$NON-NLS-1$
+	public static final String ATTR_VALUE_LOWER_ALPHA = "a"; // LI //$NON-NLS-1$
+	public static final String ATTR_VALUE_UPPER_ALPHA = "A"; // LI //$NON-NLS-1$
+	public static final String ATTR_VALUE_LOWER_ROMAN = "i"; // LI //$NON-NLS-1$
+	public static final String ATTR_VALUE_UPPER_ROMAN = "I"; // LI //$NON-NLS-1$
+	//   for loop of BGSOUND (D205513)
+	public static final String ATTR_VALUE_INFINITE = "infinite"; // BGSOUND //$NON-NLS-1$
+}
+\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLCMProperties.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLCMProperties.java
new file mode 100644
index 0000000000..5396cd65a4
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLCMProperties.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.html.core.internal.provisional;
+
+
+/**
+ * HTMLCMProperties defines all property names and pre-defined values in HTML CM.
+ * All of those properties can be retreived from element declarations of HTML CM
+ * via CMNode#getProperty(String propName).
+ */
+public interface HTMLCMProperties {
+
+	/**
+	 * "shouldIgnoreCase" returns java.lang.Boolean object.
+	 */
+	public static final String SHOULD_IGNORE_CASE = "shouldIgnoreCase";//$NON-NLS-1$
+	/**
+	 * "shouldKeepSpace" returns java.lang.Boolean object.
+	 */
+	public static final String SHOULD_KEEP_SPACE = "shouldKeepSpace";//$NON-NLS-1$
+	/**
+	 * "indentChildSource" returns java.lang.Boolean object.
+	 */
+	public static final String SHOULD_INDENT_CHILD_SOURCE = "shouldIndentChildSource";//$NON-NLS-1$
+	/**
+	 * "terminators" returns java.util.Iterator (an array of String objects).
+	 */
+	public static final String TERMINATORS = "terminators";//$NON-NLS-1$
+	/**
+	 * "contentHint" returns CMElementDeclaration instnace.
+	 */
+	public static final String CONTENT_HINT = "contentHint";//$NON-NLS-1$
+	/**
+	 * "prohibitedAncestors" returns org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap.
+	 */
+	public static final String PROHIBITED_ANCESTORS = "prohibitedAncestors";//$NON-NLS-1$
+	/**
+	 * "isJSP" returns java.lang.Boolean object.
+	 */
+	public static final String IS_JSP = "isJSP";//$NON-NLS-1$
+	/**
+	 * "isXHTML" returns java.lang.Boolean object.
+	 */
+	public static final String IS_XHTML = "isXHTML";//$NON-NLS-1$
+	/**
+	 * "isSSI" returns java.lang.Boolean object.
+	 */
+	public static final String IS_SSI = "isSSI";//$NON-NLS-1$
+	/**
+	 * "lineBreakHint" returns String (one of pre-defined values in Values).
+	 */
+	public static final String LINE_BREAK_HINT = "lineBreakHint";//$NON-NLS-1$
+	/**
+	 * "layoutType" returns String (one of pre-defined values in Values).
+	 */
+	public static final String LAYOUT_TYPE = "layoutType";//$NON-NLS-1$
+	/**
+	 * "tagInfo" returns String (documentation for this element).
+	 */
+	public static final String TAGINFO = "tagInfo";//$NON-NLS-1$
+	/**
+	 * "omitType" returns String (one of pre-defined values in Values).
+	 */
+	public static final String OMIT_TYPE = "omitType";//$NON-NLS-1$
+	/**
+	 * "inclusion" returns org.eclipse.wst.xml.core.internal.contentmodel.CMContent.
+	 */
+	public static final String INCLUSION = "inclusion";//$NON-NLS-1$
+	/**
+	 * "isScriptable" returns java.lang.Boolean object.
+	 */
+	public static final String IS_SCRIPTABLE = "isScriptable"; //$NON-NLS-1$
+
+	public static interface Values {
+		/*
+		 * for LINE_BREAK_HINT = "lineBreakHint".
+		 */
+		public static final String BREAK_NONE = "breakNone";//$NON-NLS-1$
+		public static final String BREAK_AFTER_START = "breakAfterStart";//$NON-NLS-1$
+		public static final String BREAK_BEFORE_START_AND_AFTER_END = "breakBeforeStartAndAfterEnd";//$NON-NLS-1$
+		/*
+		 * for LAYOUT_TYPE = "layoutType"
+		 */
+		public static final String LAYOUT_BLOCK = "layoutBlock";//$NON-NLS-1$
+		/** BR */
+		public static final String LAYOUT_BREAK = "layoutBreak";//$NON-NLS-1$
+		/** Hidden object; like HTML or HEAD */
+		public static final String LAYOUT_HIDDEN = "layoutHidden";//$NON-NLS-1$
+		public static final String LAYOUT_NONE = "layoutNone";//$NON-NLS-1$
+		/** No wrap object; like IMG, APPLET,... */
+		public static final String LAYOUT_OBJECT = "layoutObject";//$NON-NLS-1$
+		public static final String LAYOUT_WRAP = "layoutWrap";//$NON-NLS-1$
+		/*
+		 * for OMIT_TYPE = "omitType"
+		 */
+		/** Not ommisible. */
+		public static final String OMIT_NONE = "omitNone";//$NON-NLS-1$
+		/** Both tags are ommisible. */
+		public static final String OMIT_BOTH = "omitBoth";//$NON-NLS-1$
+		/** The end tag is ommisible. */
+		public static final String OMIT_END = "omitEnd";//$NON-NLS-1$
+		/** The end tag is ommitted when created. */
+		public static final String OMIT_END_DEFAULT = "omitEndDefault";//$NON-NLS-1$
+		/** The end tag must be omitted. */
+		public static final String OMIT_END_MUST = "omitEndMust";//$NON-NLS-1$
+
+	}
+}
+\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFilesPreferenceNames.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFilesPreferenceNames.java
new file mode 100644
index 0000000000..8bb687058e
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFilesPreferenceNames.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.html.core.internal.provisional;
+
+import org.eclipse.core.runtime.IProduct;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
+
+/**
+ * Additional preferences for new HTML Files generation
+ */
+public interface HTMLFilesPreferenceNames extends CommonModelPreferenceNames {
+
+	static final String DEFAULT_SUFFIX = "defaultSuffix";//$NON-NLS-1$
+	static final String HTML_SUFFIX = "html";//$NON-NLS-1$
+	static final String GENERATE_DOCUMENT_TYPE = "generateDocumentType";//$NON-NLS-1$
+	static final String GENERATE_GENERATOR = "generateGenerator";//$NON-NLS-1$
+	// added this as a potential way to handle changing
+	// product names "up" the stack. Note, not declared final 
+	// to avoid getting 'inlined' by compiler.
+	static IProduct product = Platform.getProduct();
+	// Platform.getProduct() is spec'd so it might return null.
+	// Its expected for any final product it would not be, so we'll return 
+	// "WTP" for development/interim builds. No need to translate. 
+	static String GENERATOR = (product == null) ? "WTP": product.getName(); //$NON-NLS-1$
+}
+\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFormatContraints.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFormatContraints.java
new file mode 100644
index 0000000000..a4cde9fa80
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/HTMLFormatContraints.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.html.core.internal.provisional;
+
+import org.eclipse.wst.sse.core.internal.format.IStructuredFormatContraints;
+
+/**
+ * @deprecated
+ * Please un-deprecate this if Page Designer thinks they are needed.
+ */
+public interface HTMLFormatContraints extends IStructuredFormatContraints {
+	/**
+	 * @deprecated
+	 * 	It's very hard to keep the available line width accurate.
+	 * 	Sometimes a node wants to start on a new line, sometimes it doesn't.
+	 * 	It's best for the node to figure out the available line width on the fly.
+	 */
+	int getAvailableLineWidth();
+
+	/**
+	 * @deprecated
+	 * 	It's very hard to keep the available line width accurate.
+	 * 	Sometimes a node wants to start on a new line, sometimes it doesn't.
+	 * 	It's best for the node to figure out the available line width on the fly.
+	 */
+	void setAvailableLineWidth(int availableLineWidth);
+}
+\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/PreferenceNames.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/PreferenceNames.java
new file mode 100644
index 0000000000..530c28d60d
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/PreferenceNames.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.html.core.internal.provisional;
+
+
+public interface PreferenceNames {
+
+	String TRUE = "true"; //$NON-NLS-1$
+	String FALSE = "false"; //$NON-NLS-1$
+	String YES = "yes"; //$NON-NLS-1$
+	String NO = "no"; //$NON-NLS-1$
+
+
+	String SETTINGS = "settings"; //$NON-NLS-1$
+
+	String TREEVIEW = "treeview"; //$NON-NLS-1$
+	String DEFAULT_DEPTH = "defaultdepth"; //$NON-NLS-1$
+
+	String ASIS = "as-is"; //$NON-NLS-1$
+	String LOWER = "lower"; //$NON-NLS-1$
+	String UPPER = "upper"; //$NON-NLS-1$
+
+	String PREFERRED_CASE = "preferred-case"; //$NON-NLS-1$
+	String TAGNAME = "tagname"; //$NON-NLS-1$
+	String ATTRIBUTENAME = "attributename"; //$NON-NLS-1$
+
+}
+\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/contenttype/ContentTypeIdForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/contenttype/ContentTypeIdForHTML.java
new file mode 100644
index 0000000000..d01304df37
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/contenttype/ContentTypeIdForHTML.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     
+ *******************************************************************************/
+
+package org.eclipse.wst.html.core.internal.provisional.contenttype;
+
+/**
+ * The value of the contenttype id field must match what is specified in
+ * plugin.xml file. Note: this value is intentially set with default protected
+ * method so it will not be inlined.
+ */
+
+public class ContentTypeIdForHTML {
+	/**
+	 * The value of the contenttype id field must match what is specified in
+	 * plugin.xml file. Note: this value is intentially not declared as final,
+	 * so it will not be inlined.
+	 */
+	public final static String ContentTypeID_HTML = getConstantString();
+
+	/**
+	 * Don't allow instantiation.
+	 */
+	private ContentTypeIdForHTML() {
+		super();
+	}
+
+	static String getConstantString() {
+		return "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$
+	}
+
+}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/text/IHTMLPartitionTypes.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/text/IHTMLPartitionTypes.java
new file mode 100644
index 0000000000..60d619c110
--- /dev/null
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/provisional/text/IHTMLPartitionTypes.java
@@ -0,0 +1,21 @@
+package org.eclipse.wst.html.core.internal.provisional.text;
+
+
+/**
+ * This interface is not intended to be implemented. It defines the partition
+ * types for HTML. Clients should reference the partition type Strings defined
+ * here directly.
+ * 
+ * @since 1.0
+ */
+public interface IHTMLPartitionTypes {
+
+	String HTML_DEFAULT = "org.eclipse.wst.html.HTML_DEFAULT"; //$NON-NLS-1$
+	String HTML_DECLARATION = "org.eclipse.wst.html.HTML_DECLARATION"; //$NON-NLS-1$
+	String HTML_COMMENT = "org.eclipse.wst.html.HTML_COMMENT"; //$NON-NLS-1$
+
+	String SCRIPT = "org.eclipse.wst.html.SCRIPT"; //$NON-NLS-1$
+	String STYLE = "org.eclipse.wst.html.STYLE"; //$NON-NLS-1$
+
+	// ISSUE: I think meta tag areas are here too?
+}
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java
index 9cd9160e55..a1bbb41623 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/text/StructuredTextPartitionerForHTML.java
@@ -13,17 +13,17 @@ package org.eclipse.wst.html.core.internal.text;
 import java.util.Locale;
 
 import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.css.core.text.ICSSPartitionTypes;
-import org.eclipse.wst.html.core.HTML40Namespace;
-import org.eclipse.wst.html.core.text.IHTMLPartitionTypes;
+import org.eclipse.wst.css.core.internal.provisional.text.ICSSPartitionTypes;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
+import org.eclipse.wst.html.core.internal.provisional.text.IHTMLPartitionTypes;
 import org.eclipse.wst.sse.core.internal.parser.ForeignRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
 import org.eclipse.wst.sse.core.internal.text.rules.IStructuredTypedRegion;
 import org.eclipse.wst.sse.core.internal.util.ScriptLanguageKeys;
 import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.sse.core.text.ITextRegionList;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java
index e84216dfce..a8af2e59f2 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CMUtil.java
@@ -13,9 +13,8 @@ package org.eclipse.wst.html.core.internal.validate;
 
 import java.util.Iterator;
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
 import org.eclipse.wst.html.core.internal.modelquery.HMQUtil;
-import org.eclipse.wst.xml.core.document.IDOMElement;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
@@ -25,6 +24,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
 import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
 import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java
index de268ba042..0ad2128e7a 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/CompositeValidator.java
@@ -13,7 +13,7 @@ package org.eclipse.wst.html.core.internal.validate;
 import java.util.Iterator;
 import java.util.Vector;
 
-import org.eclipse.wst.sse.core.IndexedRegion;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
 import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
 import org.eclipse.wst.sse.core.internal.validate.ValidationReporter;
 import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java
index c3d95b776b..4e338e6707 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/DocumentPropagatingValidator.java
@@ -11,7 +11,7 @@
 package org.eclipse.wst.html.core.internal.validate;
 
 
-import org.eclipse.wst.sse.core.IndexedRegion;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
 import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
 import org.eclipse.wst.sse.core.internal.validate.ValidationReporter;
 import org.eclipse.wst.xml.core.internal.validate.AbstractPropagatingValidator;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java
index 960199def1..c16984c8c2 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/FMUtil.java
@@ -12,8 +12,8 @@ package org.eclipse.wst.html.core.internal.validate;
 
 
 
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 
 final class FMUtil {
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java
index c80856ce31..63f5831731 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java
@@ -14,17 +14,17 @@ package org.eclipse.wst.html.core.internal.validate;
 
 import java.util.Iterator;
 
-import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.sse.core.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.text.ITextRegionList;
-import org.eclipse.wst.xml.core.document.IDOMAttr;
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java
index 7a03b632b3..026e6d2bf9 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLDocumentContentValidator.java
@@ -15,13 +15,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
-import org.eclipse.wst.html.core.HTML40Namespace;
-import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
-import org.eclipse.wst.xml.core.document.IDOMNode;
-import org.eclipse.wst.xml.core.document.IDOMText;
+import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Element;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java
index 725314a2b3..6ae5e13f63 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementAncestorValidator.java
@@ -12,12 +12,12 @@ package org.eclipse.wst.html.core.internal.validate;
 
 
 
-import org.eclipse.wst.html.core.HTMLCMProperties;
-import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.w3c.dom.Element;
 
 public class HTMLElementAncestorValidator extends PrimeValidator {
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java
index 717082bea5..8ec0839321 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLElementContentValidator.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.validate;
 
-import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.xml.core.document.IDOMNode;
-import org.eclipse.wst.xml.core.document.IDOMText;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java
index be8828d931..7b5088677c 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLValidationAdapterFactory.java
@@ -12,10 +12,10 @@ package org.eclipse.wst.html.core.internal.validate;
 
 
 
-import org.eclipse.wst.sse.core.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
+import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.validate.ValidationAdapter;
 import org.w3c.dom.Node;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java
index d82487f91e..bda5f6f45f 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NamespaceValidator.java
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.validate;
 
-import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.xml.core.document.IDOMAttr;
-import org.eclipse.wst.xml.core.document.IDOMElement;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java
index f3f1e6405c..fb1f93cade 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/NullValidator.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.html.core.internal.validate;
 
-import org.eclipse.wst.sse.core.IndexedRegion;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
 import org.eclipse.wst.sse.core.internal.validate.ValidationReporter;
 import org.eclipse.wst.xml.core.internal.validate.ValidationComponent;
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java
index 109ce0088e..b9fd37ea83 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/Segment.java
@@ -12,7 +12,7 @@ package org.eclipse.wst.html.core.internal.validate;
 
 
 
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
 
 public class Segment {
 
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
index 26437db6b2..ae6ac8d7ad 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/SyntaxValidator.java
@@ -14,16 +14,16 @@ import java.util.Iterator;
 
 import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeEntry;
 import org.eclipse.wst.html.core.internal.document.HTMLDocumentTypeRegistry;
-import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.sse.core.text.ITextRegionList;
-import org.eclipse.wst.xml.core.document.IDOMDocument;
-import org.eclipse.wst.xml.core.document.IDOMElement;
-import org.eclipse.wst.xml.core.document.IDOMNode;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
 import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
 import org.eclipse.wst.xml.core.internal.document.SourceValidator;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
author	david_williams	2005-04-18 08:00:30 +0000
committer	david_williams	2005-04-18 08:00:30 +0000
commit	4ad020f33bd9ae4c3b1dcc95ac14804bea8d4ac0 (patch)
tree	85c347c480c85d69864be569d20183b0035d20eb /bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal
parent	84861fab6da9bfdc0b203655234476fcb334ca7c (diff)
download	webtools.sourceediting-4ad020f33bd9ae4c3b1dcc95ac14804bea8d4ac0.tar.gz webtools.sourceediting-4ad020f33bd9ae4c3b1dcc95ac14804bea8d4ac0.tar.xz webtools.sourceediting-4ad020f33bd9ae4c3b1dcc95ac14804bea8d4ac0.zip