simplification — introduce StateSplitterEx

platform/analysis-api/src/com/intellij/profile/DefaultProjectProfileManager.java

@@ -98,7 +98,7 @@ public abstract class DefaultProjectProfileManager extends ProjectProfileManager
   @Nullable
   @Override
   public synchronized Element getState() {
-    Element state = new Element("state");
+    Element state = new Element("settings");
 
     String[] sortedProfiles = myProfiles.keySet().toArray(new String[myProfiles.size()]);
     Arrays.sort(sortedProfiles);

platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/DirectoryStorageData.java

@@ -268,7 +268,7 @@ public class DirectoryStorageData extends StorageDataBase {
         if (subState == null) {
           return null;
         }
-        subElements.add(state);
+        subElements.add(subState);
       }
 
       if (!subElements.isEmpty()) {