diff --git a/codan/org.eclipse.cdt.codan.core/plugin.xml b/codan/org.eclipse.cdt.codan.core/plugin.xml
index dfe75711567..a3af004ed87 100644
--- a/codan/org.eclipse.cdt.codan.core/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.core/plugin.xml
@@ -63,6 +63,9 @@
    
    <extension
          point="org.eclipse.core.runtime.preferences">
+      <initializer
+            class="org.eclipse.cdt.codan.internal.core.PreferenceInitializer">
+      </initializer>
    </extension>
 
       <extension
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.core/src/org/eclipse/cdt/codan/internal/core/PreferenceInitializer.java
similarity index 52%
rename from codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/PreferenceInitializer.java
rename to codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/PreferenceInitializer.java
index 2c733536b41..98ba2c140df 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/PreferenceInitializer.java
+++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/PreferenceInitializer.java
@@ -1,35 +1,32 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Alena Laskavaia 
+ * Copyright (c) 2009, 2011 Alena Laskavaia
  * 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:
- *    Alena Laskavaia  - initial API and implementation
+ *     Alena Laskavaia  - initial API and implementation
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
-package org.eclipse.cdt.codan.internal.ui.preferences;
+package org.eclipse.cdt.codan.internal.core;
 
+import org.eclipse.cdt.codan.core.CodanCorePlugin;
 import org.eclipse.cdt.codan.core.PreferenceConstants;
-import org.eclipse.cdt.codan.internal.ui.CodanUIActivator;
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 
 /**
  * Class used to initialize default preference values.
  */
 public class PreferenceInitializer extends AbstractPreferenceInitializer {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#
-	 * initializeDefaultPreferences()
-	 */
 	@Override
 	public void initializeDefaultPreferences() {
-		IPreferenceStore store = CodanUIActivator.getDefault().getPreferenceStore();
-		store.setDefault(PreferenceConstants.P_RUN_ON_BUILD, false);
-		store.setDefault(PreferenceConstants.P_RUN_IN_EDITOR, true);
-		store.setDefault(PreferenceConstants.P_USE_PARENT, true);
+		IEclipsePreferences node =
+				DefaultScope.INSTANCE.getNode(CodanCorePlugin.getDefault().getBundle().getSymbolicName());
+		node.putBoolean(PreferenceConstants.P_RUN_ON_BUILD, false);
+		node.putBoolean(PreferenceConstants.P_RUN_IN_EDITOR, true);
+		node.putBoolean(PreferenceConstants.P_USE_PARENT, true);
 	}
 }
diff --git a/codan/org.eclipse.cdt.codan.ui/plugin.xml b/codan/org.eclipse.cdt.codan.ui/plugin.xml
index b96944c1edd..73de0766544 100644
--- a/codan/org.eclipse.cdt.codan.ui/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.ui/plugin.xml
@@ -45,14 +45,6 @@
          </enabledWhen>
       </page>
    </extension>
-   
-   
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer
-            class="org.eclipse.cdt.codan.internal.ui.preferences.PreferenceInitializer">
-      </initializer>
-   </extension>
 
    <extension
          point="org.eclipse.ui.commands">