diff --git a/platform/platform-api/src/com/intellij/openapi/components/ApplicationComponent.java b/platform/core-api/src/com/intellij/openapi/components/ApplicationComponent.java
similarity index 95%
rename from platform/platform-api/src/com/intellij/openapi/components/ApplicationComponent.java
rename to platform/core-api/src/com/intellij/openapi/components/ApplicationComponent.java
index 36257296435d..9fcdb5ece448 100644
--- a/platform/platform-api/src/com/intellij/openapi/components/ApplicationComponent.java
+++ b/platform/core-api/src/com/intellij/openapi/components/ApplicationComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/platform-api/platform-api.iml b/platform/platform-api/platform-api.iml
index 96bc786658ac..c98c76e7e541 100644
--- a/platform/platform-api/platform-api.iml
+++ b/platform/platform-api/platform-api.iml
@@ -28,6 +28,7 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="projectModel-api" />
   </component>
 </module>
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/MouseGestureManager.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/MouseGestureManager.java
index d644c7120f7e..7f19ac2ef1e8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/MouseGestureManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/MouseGestureManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,24 +15,15 @@
  */
 package com.intellij.openapi.actionSystem.impl;
 
-import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.colors.EditorColorsManager;
-import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.wm.IdeFrame;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/util/FoundationLoader.java b/platform/platform-impl/src/com/intellij/openapi/util/FoundationLoader.java
index 57d903ce780e..fbef49583b7c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/util/FoundationLoader.java
+++ b/platform/platform-impl/src/com/intellij/openapi/util/FoundationLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.util;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.ui.mac.foundation.Foundation;
 import org.jetbrains.annotations.NotNull;
diff --git a/platform/platform-api/src/com/intellij/openapi/application/PathMacros.java b/platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java
similarity index 97%
rename from platform/platform-api/src/com/intellij/openapi/application/PathMacros.java
rename to platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java
index 23bdf55938a6..160aed545b03 100644
--- a/platform/platform-api/src/com/intellij/openapi/application/PathMacros.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/application/PathMacros.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/platform-impl/src/com/intellij/application/options/PathMacrosImpl.java b/platform/projectModel-impl/src/com/intellij/application/options/PathMacrosImpl.java
similarity index 99%
rename from platform/platform-impl/src/com/intellij/application/options/PathMacrosImpl.java
rename to platform/projectModel-impl/src/com/intellij/application/options/PathMacrosImpl.java
index 823588c76192..53eaf30ab23c 100644
--- a/platform/platform-impl/src/com/intellij/application/options/PathMacrosImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/application/options/PathMacrosImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/platform-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java b/platform/projectModel-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
similarity index 99%
rename from platform/platform-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
rename to platform/projectModel-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
index 4d26ae701515..39c6651c342e 100644
--- a/platform/platform-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
+++ b/platform/projectModel-impl/src/com/intellij/application/options/ReplacePathToMacroMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java b/platform/projectModel-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
similarity index 97%
rename from platform/platform-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
rename to platform/projectModel-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
index dc16a2b862ff..c177cac64e19 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/PathMacroMap.java b/platform/projectModel-impl/src/com/intellij/openapi/components/PathMacroMap.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/components/PathMacroMap.java
rename to platform/projectModel-impl/src/com/intellij/openapi/components/PathMacroMap.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
rename to platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
diff --git a/platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
rename to platform/projectModel-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/ProjectPathMacroManager.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/ProjectPathMacroManager.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/components/impl/ProjectPathMacroManager.java
rename to platform/projectModel-impl/src/com/intellij/openapi/components/impl/ProjectPathMacroManager.java