diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/plugin.xml b/codan/org.eclipse.cdt.codan.checkers.ui/plugin.xml
index 783ff1d88d6..52cc0a79bf2 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.ui.ide.markerResolution">
       <markerResolutionGenerator
-            class="org.eclipse.cdt.codan.checkers.ui.quickfix.CodanProblemMarkerResolutionGenerator"
+            class="org.eclipse.cdt.codan.internal.checkers.ui.quickfix.CodanProblemMarkerResolutionGenerator"
             markerType="org.eclipse.cdt.codan.core.codanProblem">
       </markerResolutionGenerator>
    </extension>
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java
similarity index 95%
rename from codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java
rename to codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java
index 1470e7fb0e5..9c6870df365 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CodanProblemMarkerResolutionGenerator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Andrew Gvozdev  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.checkers.ui.quickfix;
+package org.eclipse.cdt.codan.internal.checkers.ui.quickfix;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixAssignmentInCondition.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java
similarity index 97%
rename from codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixAssignmentInCondition.java
rename to codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java
index 5c28d53ca01..19f3c6c4d69 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixAssignmentInCondition.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Andrew Gvozdev  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.checkers.ui.quickfix;
+package org.eclipse.cdt.codan.internal.checkers.ui.quickfix;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
diff --git a/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
index 50e70f6890b..a3e3ba70868 100644
--- a/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Checkers
 Bundle-SymbolicName: org.eclipse.cdt.codan.checkers;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.cdt.codan.checkers.Activator
+Bundle-Activator: org.eclipse.cdt.codan.checkers.CodanCheckersActivator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.cdt.core;bundle-version="5.1.0",
diff --git a/codan/org.eclipse.cdt.codan.checkers/plugin.xml b/codan/org.eclipse.cdt.codan.checkers/plugin.xml
index cef76bf850c..a61f946f23d 100644
--- a/codan/org.eclipse.cdt.codan.checkers/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.checkers/plugin.xml
@@ -6,7 +6,7 @@
          id="org.eclipse.cdt.codan.core.checkers.sample">
 
       <checker
-            class="org.eclipse.cdt.codan.checkers.sample.AssignmentInConditionChecker"
+            class="org.eclipse.cdt.codan.internal.checkers.sample.AssignmentInConditionChecker"
             id="org.eclipse.cdt.codan.checkers.sample.AssignmentInConditionChecker"
             name="Assignment in condition">
       <problem
@@ -18,7 +18,7 @@
       
       </checker>
             <checker
-            class="org.eclipse.cdt.codan.checkers.sample.StatementHasNoEffectChecker"
+            class="org.eclipse.cdt.codan.internal.checkers.sample.StatementHasNoEffectChecker"
             id="org.eclipse.cdt.codan.checkers.sample.StatementHasNoEffectChecker"
             name="StatementHasNoEffectChecker">
       <problem
@@ -30,7 +30,7 @@
       </checker>
       
       <checker
-            class="org.eclipse.cdt.codan.checkers.sample.NonVirtualDestructor"
+            class="org.eclipse.cdt.codan.internal.checkers.sample.NonVirtualDestructor"
             id="org.eclipse.cdt.codan.checkers.sample.NonVirtualDescructor"
             name="NonVirtualDescructorChecker">
       <problem
@@ -42,7 +42,7 @@
       </checker>
 
       <checker
-            class="org.eclipse.cdt.codan.checkers.sample.CatchUsesReference"
+            class="org.eclipse.cdt.codan.internal.checkers.sample.CatchUsesReference"
             id="org.eclipse.cdt.codan.checkers.sample.CatchUsesReference"
             name="CatchUsesReferenceChecker">
       <problem
@@ -53,7 +53,7 @@
       </problem>
       </checker>
       <checker
-            class="org.eclipse.cdt.codan.checkers.sample.SuggestedParenthesisChecker"
+            class="org.eclipse.cdt.codan.internal.checkers.sample.SuggestedParenthesisChecker"
             id="org.eclipse.cdt.codan.checkers.sample.SuggestedParenthesisChecker"
             name="SuggestedParenthesisChecker">
       <problem
@@ -64,7 +64,7 @@
       </problem>
       </checker>
             <checker
-            class="org.eclipse.cdt.codan.checkers.sample.NamingConventionFunctionChecker"
+            class="org.eclipse.cdt.codan.internal.checkers.sample.NamingConventionFunctionChecker"
             id="org.eclipse.cdt.codan.checkers.sample.NamingConventionFunctionChecker"
             name="NamingConventionFunctionChecker">
       <problem
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/Activator.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/CodanCheckersActivator.java
similarity index 87%
rename from codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/Activator.java
rename to codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/CodanCheckersActivator.java
index 2915e7d0d80..eb0ce2fca7f 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/Activator.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/CodanCheckersActivator.java
@@ -8,16 +8,16 @@ import org.osgi.framework.BundleContext;
 /**
  * The activator class controls the plug-in life cycle
  */
-public class Activator extends Plugin {
+public class CodanCheckersActivator extends Plugin {
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.cdt.codan.checkers";
 	// The shared instance
-	private static Activator plugin;
+	private static CodanCheckersActivator plugin;
 
 	/**
 	 * The constructor
 	 */
-	public Activator() {
+	public CodanCheckersActivator() {
 	}
 
 	/*
@@ -49,7 +49,7 @@ public class Activator extends Plugin {
 	 * 
 	 * @return the shared instance
 	 */
-	public static Activator getDefault() {
+	public static CodanCheckersActivator getDefault() {
 		return plugin;
 	}
 
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/AssignmentInConditionChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/AssignmentInConditionChecker.java
similarity index 92%
rename from codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/AssignmentInConditionChecker.java
rename to codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/AssignmentInConditionChecker.java
index 5ce5661c02e..0c74ab4dda0 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/AssignmentInConditionChecker.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/AssignmentInConditionChecker.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.checkers.sample;
+package org.eclipse.cdt.codan.internal.checkers.sample;
 
 import org.eclipse.cdt.codan.core.model.AbstractIndexAstChecker;
 import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
@@ -20,7 +20,7 @@ import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
 
 public class AssignmentInConditionChecker extends AbstractIndexAstChecker {
-	private static final String ER_ID = "org.eclipse.cdt.codan.checkers.sample.AssignmentInConditionProblem";
+	private static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.sample.AssignmentInConditionProblem";
 
 	public void processAst(IASTTranslationUnit ast) {
 		// traverse the ast using the visitor pattern.
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/CatchUsesReference.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/CatchUsesReference.java
similarity index 94%
rename from codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/CatchUsesReference.java
rename to codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/CatchUsesReference.java
index b3556ccbd7f..44c2063fa61 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/CatchUsesReference.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/CatchUsesReference.java
@@ -9,7 +9,7 @@
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/ 
 
-package org.eclipse.cdt.codan.checkers.sample;
+package org.eclipse.cdt.codan.internal.checkers.sample;
 
 import org.eclipse.cdt.codan.core.model.AbstractIndexAstChecker;
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
@@ -28,7 +28,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTryBlockStatement;
  *
  */
 public class CatchUsesReference extends AbstractIndexAstChecker {
-	private static final String ER_ID = "org.eclipse.cdt.codan.checkers.sample.CatchUsesReference";
+	private static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.sample.CatchUsesReference";
 
 	public void processAst(IASTTranslationUnit ast) {
 		// traverse the ast using the visitor pattern.
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/NamingConventionFunctionChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/NamingConventionFunctionChecker.java
similarity index 94%
rename from codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/NamingConventionFunctionChecker.java
rename to codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/NamingConventionFunctionChecker.java
index 147d0ca1108..960dbef8ed6 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/NamingConventionFunctionChecker.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/NamingConventionFunctionChecker.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.checkers.sample;
+package org.eclipse.cdt.codan.internal.checkers.sample;
 
 import java.util.regex.Pattern;
 import org.eclipse.cdt.codan.core.model.AbstractCIndexChecker;
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.CoreException;
 public class NamingConventionFunctionChecker extends AbstractCIndexChecker
 		implements ICheckerWithParameters {
 	public static final String PARAM_KEY = "pattern";
-	private static final String ER_ID = "org.eclipse.cdt.codan.checkers.sample.NamingConventionFunctionProblem";
+	private static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.sample.NamingConventionFunctionProblem";
 
 	/*
 	 * (non-Javadoc)
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/NonVirtualDestructor.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/NonVirtualDestructor.java
similarity index 95%
rename from codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/NonVirtualDestructor.java
rename to codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/NonVirtualDestructor.java
index 45f7e72f1ce..90c9202bff3 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/NonVirtualDestructor.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/NonVirtualDestructor.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.checkers.sample;
+package org.eclipse.cdt.codan.internal.checkers.sample;
 
 import java.text.MessageFormat;
 
-import org.eclipse.cdt.codan.checkers.Activator;
+import org.eclipse.cdt.codan.checkers.CodanCheckersActivator;
 import org.eclipse.cdt.codan.core.model.AbstractIndexAstChecker;
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
 import org.eclipse.cdt.core.dom.ast.DOMException;
@@ -33,7 +33,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding;
  * 
  */
 public class NonVirtualDestructor extends AbstractIndexAstChecker {
-	private static final String ER_ID = "org.eclipse.cdt.codan.checkers.sample.NonVirtualDestructorProblem";
+	private static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.sample.NonVirtualDestructorProblem";
 
 	public void processAst(IASTTranslationUnit ast) {
 		// traverse the ast using the visitor pattern.
@@ -74,7 +74,7 @@ public class NonVirtualDestructor extends AbstractIndexAstChecker {
 				} catch (DOMException e) {
 					// ignore, no error
 				} catch (Exception e) {
-					Activator.log(e);
+					CodanCheckersActivator.log(e);
 				}
 				return PROCESS_SKIP;
 			}
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/StatementHasNoEffectChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/StatementHasNoEffectChecker.java
similarity index 95%
rename from codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/StatementHasNoEffectChecker.java
rename to codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/StatementHasNoEffectChecker.java
index c08f58ab2c3..a9e3083b94e 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/StatementHasNoEffectChecker.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/StatementHasNoEffectChecker.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.checkers.sample;
+package org.eclipse.cdt.codan.internal.checkers.sample;
 
 import org.eclipse.cdt.codan.core.model.AbstractIndexAstChecker;
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
@@ -36,7 +36,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTBinaryExpression;
  * 
  */
 public class StatementHasNoEffectChecker extends AbstractIndexAstChecker {
-	private static final String ER_ID = "org.eclipse.cdt.codan.checkers.sample.StatementHasNoEffectProblem";
+	private static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.sample.StatementHasNoEffectProblem";
 
 	public void processAst(IASTTranslationUnit ast) {
 		// traverse the ast using the visitor pattern.
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/SuggestedParenthesisChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/SuggestedParenthesisChecker.java
similarity index 96%
rename from codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/SuggestedParenthesisChecker.java
rename to codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/SuggestedParenthesisChecker.java
index 5df8f0535ab..c292533aa9b 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/SuggestedParenthesisChecker.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/sample/SuggestedParenthesisChecker.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.checkers.sample;
+package org.eclipse.cdt.codan.internal.checkers.sample;
 
 import org.eclipse.cdt.codan.core.model.AbstractIndexAstChecker;
 import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
@@ -29,7 +29,7 @@ import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
  * 
  */
 public class SuggestedParenthesisChecker extends AbstractIndexAstChecker {
-	private static final String ER_ID = "org.eclipse.cdt.codan.checkers.sample.SuggestedParenthesisProblem";
+	private static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.sample.SuggestedParenthesisProblem";
 
 	public void processAst(IASTTranslationUnit ast) {
 		// traverse the ast using the visitor pattern.
diff --git a/codan/org.eclipse.cdt.codan.ui/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.ui/META-INF/MANIFEST.MF
index 9d5357d0a0f..3fd988f418e 100644
--- a/codan/org.eclipse.cdt.codan.ui/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Code Analyzers Framework
 Bundle-SymbolicName: org.eclipse.cdt.codan.ui; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.cdt.codan.ui.Activator
+Bundle-Activator: org.eclipse.cdt.codan.ui.CodanUIActivator
 Bundle-Vendor: Eclipse
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/codan/org.eclipse.cdt.codan.ui/plugin.xml b/codan/org.eclipse.cdt.codan.ui/plugin.xml
index eff5ea69576..3c4976be284 100644
--- a/codan/org.eclipse.cdt.codan.ui/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.ui/plugin.xml
@@ -12,7 +12,7 @@
             id="org.eclipse.cdt.codan.ui.runaction">
          <action
                label="Run Code Analysis"
-               class="org.eclipse.cdt.codan.ui.actions.RunCodeAnalysis"
+               class="org.eclipse.cdt.codan.internal.ui.actions.RunCodeAnalysis"
                menubarPath="additions"
                enablesFor="+"
                id="org.eclipse.cdt.codan.ui.actions.RunCodeAnalysis">
@@ -65,6 +65,6 @@
    <extension
          point="org.eclipse.ui.startup">
       <startup
-            class="org.eclipse.cdt.codan.ui.Startup"></startup>
+            class="org.eclipse.cdt.codan.internal.ui.Startup"></startup>
    </extension>
 </plugin>
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/CodanCReconciler.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanCReconciler.java
similarity index 97%
rename from codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/CodanCReconciler.java
rename to codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanCReconciler.java
index 5bec1c101ba..90a4a9c7085 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/CodanCReconciler.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanCReconciler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.ui;
+package org.eclipse.cdt.codan.internal.ui;
 
 import org.eclipse.cdt.codan.core.CodanRuntime;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/Startup.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/Startup.java
similarity index 98%
rename from codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/Startup.java
rename to codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/Startup.java
index 41fbf89fdc6..939b3efaff6 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/Startup.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/Startup.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.ui;
+package org.eclipse.cdt.codan.internal.ui;
 
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IPartListener2;
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/actions/RunCodeAnalysis.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java
similarity index 97%
rename from codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/actions/RunCodeAnalysis.java
rename to codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java
index 01d7c25bdb1..8b90edf5bec 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/actions/RunCodeAnalysis.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.ui.actions;
+package org.eclipse.cdt.codan.internal.ui.actions;
 
 import java.util.Iterator;
 
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/actions/ToggleNatureAction.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/ToggleNatureAction.java
similarity index 98%
rename from codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/actions/ToggleNatureAction.java
rename to codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/ToggleNatureAction.java
index 3993621c33b..d946d3b1ab4 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/actions/ToggleNatureAction.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/ToggleNatureAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.codan.ui.actions;
+package org.eclipse.cdt.codan.internal.ui.actions;
 
 import java.util.Iterator;
 
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java
index 95f7ff67e79..968d9cb4691 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java
@@ -2,7 +2,7 @@ package org.eclipse.cdt.codan.internal.ui.preferences;
 
 import org.eclipse.cdt.codan.core.CodanCorePlugin;
 import org.eclipse.cdt.codan.core.PreferenceConstants;
-import org.eclipse.cdt.codan.ui.actions.ToggleNatureAction;
+import org.eclipse.cdt.codan.internal.ui.actions.ToggleNatureAction;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.IAdaptable;
@@ -21,7 +21,7 @@ public class BuildPropertyPage extends FieldEditorPreferencePage implements
 	 * 
 	 */
 	public BuildPropertyPage() {
-		setPreferenceStore(org.eclipse.cdt.codan.ui.Activator.getDefault()
+		setPreferenceStore(org.eclipse.cdt.codan.ui.CodanUIActivator.getDefault()
 				.getPreferenceStore());
 	}
 
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/PreferenceInitializer.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/PreferenceInitializer.java
index 43620980c77..fdd7447c045 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/PreferenceInitializer.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/PreferenceInitializer.java
@@ -25,7 +25,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
 	 */
 	public void initializeDefaultPreferences() {
-		IPreferenceStore store = org.eclipse.cdt.codan.ui.Activator
+		IPreferenceStore store = org.eclipse.cdt.codan.ui.CodanUIActivator
 				.getDefault().getPreferenceStore();
 		store.setDefault(PreferenceConstants.P_RUN_ON_BUILD, false);
 	}
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/Activator.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/CodanUIActivator.java
similarity index 92%
rename from codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/Activator.java
rename to codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/CodanUIActivator.java
index 849993afa61..8c81586195d 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/Activator.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/CodanUIActivator.java
@@ -9,16 +9,16 @@ import org.osgi.framework.BundleContext;
 /**
  * The activator class controls the plug-in life cycle
  */
-public class Activator extends AbstractUIPlugin {
+public class CodanUIActivator extends AbstractUIPlugin {
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.cdt.codan.ui";
 	// The shared instance
-	private static Activator plugin;
+	private static CodanUIActivator plugin;
 
 	/**
 	 * The constructor
 	 */
-	public Activator() {
+	public CodanUIActivator() {
 	}
 
 	/*
@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 
 	 * @return the shared instance
 	 */
-	public static Activator getDefault() {
+	public static CodanUIActivator getDefault() {
 		return plugin;
 	}