diff --git a/org.polarsys.chess.constraints.constraintEditor/.classpath b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.classpath similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/.classpath rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/.classpath diff --git a/org.polarsys.chess.constraints.constraintEditor/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.gitignore similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/.gitignore rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/.gitignore diff --git a/org.polarsys.chess.contracts.contractEditor/.project b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.project similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/.project rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/.project diff --git a/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.jdt.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.jdt.core.prefs rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.jdt.core.prefs diff --git a/org.polarsys.chess.contracts.contractEditor/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/META-INF/MANIFEST.MF similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/META-INF/MANIFEST.MF rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/META-INF/MANIFEST.MF diff --git a/org.polarsys.chess.contracts.contractEditor/build.properties b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/build.properties similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/build.properties rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/build.properties diff --git a/org.polarsys.chess.contracts.contractEditor/icons/add_obj.gif b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/add_obj.gif similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/icons/add_obj.gif rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/add_obj.gif diff --git a/org.polarsys.chess.contracts.contractEditor/icons/editor.gif b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/editor.gif similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/icons/editor.gif rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/editor.gif diff --git a/org.polarsys.chess.contracts.contractEditor/icons/editor_area.gif b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/editor_area.gif similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/icons/editor_area.gif rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/editor_area.gif diff --git a/org.polarsys.chess.contracts.contractEditor/icons/elipses.gif b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/elipses.gif similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/icons/elipses.gif rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/elipses.gif diff --git a/org.polarsys.chess.contracts.contractEditor/icons/new_untitled_text_file.gif b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/new_untitled_text_file.gif similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/icons/new_untitled_text_file.gif rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/icons/new_untitled_text_file.gif diff --git a/org.polarsys.chess.contracts.contractEditor/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/plugin.xml similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/plugin.xml rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/plugin.xml diff --git a/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorFilter.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorFilter.java similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorFilter.java rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorFilter.java diff --git a/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java diff --git a/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java rename to plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java diff --git a/org.polarsys.chess.contracts.contractEditor/.classpath b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.classpath similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/.classpath rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.classpath diff --git a/org.polarsys.chess.contracts.contractEditor/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.gitignore similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/.gitignore rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.gitignore diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/.project b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.project similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/.project rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.project diff --git a/org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.jdt.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.polarsys.chess.contracts.contractEditor/.settings/org.eclipse.jdt.core.prefs rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.jdt.core.prefs diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/META-INF/MANIFEST.MF similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/META-INF/MANIFEST.MF rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/META-INF/MANIFEST.MF diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/build.properties b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/build.properties similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/build.properties rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/build.properties diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/icons/ComponentDiagram.gif b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/icons/ComponentDiagram.gif similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/icons/ComponentDiagram.gif rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/icons/ComponentDiagram.gif diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/icons/main_tab.gif b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/icons/main_tab.gif similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/icons/main_tab.gif rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/icons/main_tab.gif diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/icons/site_element.gif b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/icons/site_element.gif similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/icons/site_element.gif rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/icons/site_element.gif diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/plugin.xml similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/plugin.xml rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/plugin.xml diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/PapyrusListener.java diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/SelectionListener.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/SelectionListener.java similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/SelectionListener.java rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/listener/SelectionListener.java diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSRootNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSRootNode.java similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSRootNode.java rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSRootNode.java diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/view/CustomHierarchicalView.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/view/CustomHierarchicalView.java similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/view/CustomHierarchicalView.java rename to plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/view/CustomHierarchicalView.java diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/.classpath b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.classpath similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/.classpath rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/.classpath diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.gitignore similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/.gitignore rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/.gitignore diff --git a/org.polarsys.chess.contracts.refinementView/.project b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.project similarity index 100% rename from org.polarsys.chess.contracts.refinementView/.project rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/.project diff --git a/org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.jdt.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.polarsys.chess.contracts.hierarchicalContractView/.settings/org.eclipse.jdt.core.prefs rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.jdt.core.prefs diff --git a/org.polarsys.chess.contracts.refinementView/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.refinementView/META-INF/MANIFEST.MF similarity index 100% rename from org.polarsys.chess.contracts.refinementView/META-INF/MANIFEST.MF rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/META-INF/MANIFEST.MF diff --git a/org.polarsys.chess.contracts.refinementView/build.properties b/plugins/contracts/org.polarsys.chess.contracts.refinementView/build.properties similarity index 100% rename from org.polarsys.chess.contracts.refinementView/build.properties rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/build.properties diff --git a/org.polarsys.chess.contracts.refinementView/icons/ComponentDiagram.gif b/plugins/contracts/org.polarsys.chess.contracts.refinementView/icons/ComponentDiagram.gif similarity index 100% rename from org.polarsys.chess.contracts.refinementView/icons/ComponentDiagram.gif rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/icons/ComponentDiagram.gif diff --git a/org.polarsys.chess.contracts.refinementView/icons/main_tab.gif b/plugins/contracts/org.polarsys.chess.contracts.refinementView/icons/main_tab.gif similarity index 100% rename from org.polarsys.chess.contracts.refinementView/icons/main_tab.gif rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/icons/main_tab.gif diff --git a/org.polarsys.chess.contracts.refinementView/icons/site_element.gif b/plugins/contracts/org.polarsys.chess.contracts.refinementView/icons/site_element.gif similarity index 100% rename from org.polarsys.chess.contracts.refinementView/icons/site_element.gif rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/icons/site_element.gif diff --git a/org.polarsys.chess.contracts.refinementView/icons/weakContract.gif b/plugins/contracts/org.polarsys.chess.contracts.refinementView/icons/weakContract.gif similarity index 100% rename from org.polarsys.chess.contracts.refinementView/icons/weakContract.gif rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/icons/weakContract.gif diff --git a/org.polarsys.chess.contracts.refinementView/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.refinementView/plugin.xml similarity index 100% rename from org.polarsys.chess.contracts.refinementView/plugin.xml rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/plugin.xml diff --git a/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java similarity index 100% rename from org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/PapyrusListener.java diff --git a/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/SelectionListener.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/SelectionListener.java similarity index 100% rename from org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/SelectionListener.java rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/listener/SelectionListener.java diff --git a/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSContractNode.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSContractNode.java similarity index 100% rename from org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSContractNode.java rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSContractNode.java diff --git a/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSRootNode.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSRootNode.java similarity index 100% rename from org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSRootNode.java rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/treeElements/CHESSRootNode.java diff --git a/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/view/CustomRefinementView.java b/plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/view/CustomRefinementView.java similarity index 100% rename from org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/view/CustomRefinementView.java rename to plugins/contracts/org.polarsys.chess.contracts.refinementView/src/org/polarsys/chess/contracts/refinementView/view/CustomRefinementView.java diff --git a/org.polarsys.chess.contracts.refinementView/.classpath b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.classpath similarity index 100% rename from org.polarsys.chess.contracts.refinementView/.classpath rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.classpath diff --git a/org.polarsys.chess.contracts.refinementView/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.gitignore similarity index 100% rename from org.polarsys.chess.contracts.refinementView/.gitignore rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.gitignore diff --git a/org.polarsys.chess.contracts.safetyAnalysis/.project b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.project similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/.project rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.project diff --git a/org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.jdt.core.prefs b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.polarsys.chess.contracts.refinementView/.settings/org.eclipse.jdt.core.prefs rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.jdt.core.prefs diff --git a/org.polarsys.chess.contracts.safetyAnalysis/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/META-INF/MANIFEST.MF similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/META-INF/MANIFEST.MF rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/META-INF/MANIFEST.MF diff --git a/org.polarsys.chess.constraints.constraintEditor/build.properties b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/build.properties similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/build.properties rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/build.properties diff --git a/org.polarsys.chess.contracts.safetyAnalysis/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/plugin.xml similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/plugin.xml rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/plugin.xml diff --git a/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/ComputeContractFaultTreeCommand.java diff --git a/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/debug/ComputeContractFaultTreeOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/debug/ComputeContractFaultTreeOnFileCommand.java similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/debug/ComputeContractFaultTreeOnFileCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis/src/org/polarsys/chess/safetyAnalysis/commands/debug/ComputeContractFaultTreeOnFileCommand.java diff --git a/org.polarsys.chess.contracts.safetyAnalysis/.classpath b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.classpath similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/.classpath rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/.classpath diff --git a/org.polarsys.chess.contracts.verificationService/.project b/plugins/contracts/org.polarsys.chess.contracts.verificationService/.project similarity index 100% rename from org.polarsys.chess.contracts.verificationService/.project rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/.project diff --git a/org.polarsys.chess.contracts.verificationService/META-INF/MANIFEST.MF b/plugins/contracts/org.polarsys.chess.contracts.verificationService/META-INF/MANIFEST.MF similarity index 100% rename from org.polarsys.chess.contracts.verificationService/META-INF/MANIFEST.MF rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/META-INF/MANIFEST.MF diff --git a/org.polarsys.chess.contracts.verificationService/bin/.gitignore b/plugins/contracts/org.polarsys.chess.contracts.verificationService/bin/.gitignore similarity index 100% rename from org.polarsys.chess.contracts.verificationService/bin/.gitignore rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/bin/.gitignore diff --git a/org.polarsys.chess.contracts.safetyAnalysis/build.properties b/plugins/contracts/org.polarsys.chess.contracts.verificationService/build.properties similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/build.properties rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/build.properties diff --git a/org.polarsys.chess.contracts.verificationService/plugin.xml b/plugins/contracts/org.polarsys.chess.contracts.verificationService/plugin.xml similarity index 100% rename from org.polarsys.chess.contracts.verificationService/plugin.xml rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/plugin.xml diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/CheckValidationPropertyCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/CheckValidationPropertyCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/CheckValidationPropertyCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/CheckValidationPropertyCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractImplementationCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractImplementationCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractImplementationCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractImplementationCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractRefinementCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractRefinementCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractRefinementCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ContractRefinementCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ExportModelToFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ExportModelToFileCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ExportModelToFileCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ExportModelToFileCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ModelCheckingCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ModelCheckingCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ModelCheckingCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/ModelCheckingCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/CheckValidationPropertyOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/CheckValidationPropertyOnFileCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/CheckValidationPropertyOnFileCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/CheckValidationPropertyOnFileCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ContractImplementationOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ContractImplementationOnFileCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ContractImplementationOnFileCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ContractImplementationOnFileCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ContractRefinementOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ContractRefinementOnFileCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ContractRefinementOnFileCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ContractRefinementOnFileCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ModelCheckingOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ModelCheckingOnFileCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ModelCheckingOnFileCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/ModelCheckingOnFileCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/RuntimeErrorsOnFileCommand.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/RuntimeErrorsOnFileCommand.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/RuntimeErrorsOnFileCommand.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/commands/debug/RuntimeErrorsOnFileCommand.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/model/ChessSystemModel.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/model/ChessSystemModel.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/model/ChessSystemModel.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/model/ChessSystemModel.java diff --git a/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/services/SmvExportService.java b/plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/services/SmvExportService.java similarity index 100% rename from org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/services/SmvExportService.java rename to plugins/contracts/org.polarsys.chess.contracts.verificationService/src/org/polarsys/chess/verificationService/services/SmvExportService.java diff --git a/org.polarsys.chess.contracts.verificationService/.classpath b/plugins/org.polarsys.chess.constraints.constraintEditor/.classpath similarity index 100% rename from org.polarsys.chess.contracts.verificationService/.classpath rename to plugins/org.polarsys.chess.constraints.constraintEditor/.classpath diff --git a/org.polarsys.chess.contracts.safetyAnalysis/.gitignore b/plugins/org.polarsys.chess.constraints.constraintEditor/.gitignore similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/.gitignore rename to plugins/org.polarsys.chess.constraints.constraintEditor/.gitignore diff --git a/org.polarsys.chess.constraints.constraintEditor/.project b/plugins/org.polarsys.chess.constraints.constraintEditor/.project similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/.project rename to plugins/org.polarsys.chess.constraints.constraintEditor/.project diff --git a/org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.polarsys.chess.contracts.safetyAnalysis/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.polarsys.chess.constraints.constraintEditor/.settings/org.eclipse.jdt.core.prefs diff --git a/org.polarsys.chess.constraints.constraintEditor/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.constraints.constraintEditor/META-INF/MANIFEST.MF similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/META-INF/MANIFEST.MF rename to plugins/org.polarsys.chess.constraints.constraintEditor/META-INF/MANIFEST.MF diff --git a/org.polarsys.chess.contracts.verificationService/build.properties b/plugins/org.polarsys.chess.constraints.constraintEditor/build.properties similarity index 100% rename from org.polarsys.chess.contracts.verificationService/build.properties rename to plugins/org.polarsys.chess.constraints.constraintEditor/build.properties diff --git a/org.polarsys.chess.constraints.constraintEditor/plugin.xml b/plugins/org.polarsys.chess.constraints.constraintEditor/plugin.xml similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/plugin.xml rename to plugins/org.polarsys.chess.constraints.constraintEditor/plugin.xml diff --git a/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java b/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java rename to plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java diff --git a/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/CustomConstraintEditorTab.java b/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/CustomConstraintEditorTab.java similarity index 100% rename from org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/CustomConstraintEditorTab.java rename to plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/CustomConstraintEditorTab.java diff --git a/org.polarsys.chess.diagram.ui/.classpath b/plugins/org.polarsys.chess.diagram.ui/.classpath similarity index 100% rename from org.polarsys.chess.diagram.ui/.classpath rename to plugins/org.polarsys.chess.diagram.ui/.classpath diff --git a/org.polarsys.chess.diagram.ui/.gitignore b/plugins/org.polarsys.chess.diagram.ui/.gitignore similarity index 100% rename from org.polarsys.chess.diagram.ui/.gitignore rename to plugins/org.polarsys.chess.diagram.ui/.gitignore diff --git a/org.polarsys.chess.diagram.ui/.project b/plugins/org.polarsys.chess.diagram.ui/.project similarity index 100% rename from org.polarsys.chess.diagram.ui/.project rename to plugins/org.polarsys.chess.diagram.ui/.project diff --git a/org.polarsys.chess.diagram.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.polarsys.chess.diagram.ui/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.polarsys.chess.diagram.ui/.settings/org.eclipse.jdt.core.prefs diff --git a/org.polarsys.chess.diagram.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.diagram.ui/META-INF/MANIFEST.MF similarity index 100% rename from org.polarsys.chess.diagram.ui/META-INF/MANIFEST.MF rename to plugins/org.polarsys.chess.diagram.ui/META-INF/MANIFEST.MF diff --git a/org.polarsys.chess.diagram.ui/build.properties b/plugins/org.polarsys.chess.diagram.ui/build.properties similarity index 100% rename from org.polarsys.chess.diagram.ui/build.properties rename to plugins/org.polarsys.chess.diagram.ui/build.properties diff --git a/org.polarsys.chess.diagram.ui/plugin.xml b/plugins/org.polarsys.chess.diagram.ui/plugin.xml similarity index 100% rename from org.polarsys.chess.diagram.ui/plugin.xml rename to plugins/org.polarsys.chess.diagram.ui/plugin.xml diff --git a/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportComponentToImageCommand.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportComponentToImageCommand.java similarity index 100% rename from org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportComponentToImageCommand.java rename to plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportComponentToImageCommand.java diff --git a/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportModelToDocumentCommand.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportModelToDocumentCommand.java similarity index 100% rename from org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportModelToDocumentCommand.java rename to plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/ExportModelToDocumentCommand.java diff --git a/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java similarity index 100% rename from org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java rename to plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/commands/GenerateDocumentCommand.java diff --git a/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSBlockDefinitionDiagramModel.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSBlockDefinitionDiagramModel.java similarity index 100% rename from org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSBlockDefinitionDiagramModel.java rename to plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSBlockDefinitionDiagramModel.java diff --git a/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSInternalBlockDiagramModel.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSInternalBlockDiagramModel.java similarity index 100% rename from org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSInternalBlockDiagramModel.java rename to plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/docGenerators/CHESSInternalBlockDiagramModel.java diff --git a/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java similarity index 100% rename from org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java rename to plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/services/CHESSDiagramsGeneratorService.java diff --git a/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/utils/ExportDialogUtils.java b/plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/utils/ExportDialogUtils.java similarity index 100% rename from org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/utils/ExportDialogUtils.java rename to plugins/org.polarsys.chess.diagram.ui/src/org/polarsys/chess/diagram/ui/utils/ExportDialogUtils.java diff --git a/org.polarsys.chess.properties.propertyEditor/.classpath b/plugins/org.polarsys.chess.properties.propertyEditor/.classpath similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/.classpath rename to plugins/org.polarsys.chess.properties.propertyEditor/.classpath diff --git a/org.polarsys.chess.properties.propertyEditor/.gitignore b/plugins/org.polarsys.chess.properties.propertyEditor/.gitignore similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/.gitignore rename to plugins/org.polarsys.chess.properties.propertyEditor/.gitignore diff --git a/org.polarsys.chess.properties.propertyEditor/.project b/plugins/org.polarsys.chess.properties.propertyEditor/.project similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/.project rename to plugins/org.polarsys.chess.properties.propertyEditor/.project diff --git a/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.jdt.core.prefs rename to plugins/org.polarsys.chess.properties.propertyEditor/.settings/org.eclipse.jdt.core.prefs diff --git a/org.polarsys.chess.properties.propertyEditor/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.properties.propertyEditor/META-INF/MANIFEST.MF similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/META-INF/MANIFEST.MF rename to plugins/org.polarsys.chess.properties.propertyEditor/META-INF/MANIFEST.MF diff --git a/org.polarsys.chess.properties.propertyEditor/build.properties b/plugins/org.polarsys.chess.properties.propertyEditor/build.properties similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/build.properties rename to plugins/org.polarsys.chess.properties.propertyEditor/build.properties diff --git a/org.polarsys.chess.properties.propertyEditor/plugin.xml b/plugins/org.polarsys.chess.properties.propertyEditor/plugin.xml similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/plugin.xml rename to plugins/org.polarsys.chess.properties.propertyEditor/plugin.xml diff --git a/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/CustomPropertyEditorTab.java b/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/CustomPropertyEditorTab.java similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/CustomPropertyEditorTab.java rename to plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/CustomPropertyEditorTab.java diff --git a/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java b/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java similarity index 100% rename from org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java rename to plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java