diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBasicComponent_fineGrainedBehavior_FineGrainedBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBasicComponent_fineGrainedBehavior_FineGrainedBehavior.gif
deleted file mode 100644
index 86fde1e236e11f6c4dc311658422f3043fe630ec..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBasicComponent_fineGrainedBehavior_FineGrainedBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBasicComponent_semaphores_Semaphore.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBasicComponent_semaphores_Semaphore.gif
deleted file mode 100644
index 9d6e42e4548dd882b82535ee0b1a8a743697dfca..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBasicComponent_semaphores_Semaphore.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BinaryBooleanExpression.gif
deleted file mode 100644
index 6153c8dfcbb5bf74fcfd547e96699c6daf8b6bca..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BooleanLiteral.gif
deleted file mode 100644
index 4ec7362a76edfdda6fd5c3df0fd86745b5428e12..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BoxedPDF.gif
deleted file mode 100644
index fe0e4b2b82e6066937d4eb71e085a14fc08a7399..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Comparison.gif
deleted file mode 100644
index b9c0cab08bc0a6bf8324584ed33f0dc5bf1e5da5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_DoubleLiteral.gif
deleted file mode 100644
index 7e487021af0d3dd87f258c62e08efcfd91ee8858..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_ExponentialDistribution.gif
deleted file mode 100644
index c565965f8fcf5d4e3dd4075d22170487bf8a19f4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_FormalParameter.gif
deleted file mode 100644
index c0ac967d854aea6a6b29133ad69e8418e1bd5836..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Function.gif
deleted file mode 100644
index fe0e4b2b82e6066937d4eb71e085a14fc08a7399..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_IfElseExpression.gif
deleted file mode 100644
index 98a66f134f020b6ada9f93b8ac04713fd7b3c813..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_IntLiteral.gif
deleted file mode 100644
index 539282628a7e969261bc0994edd169be63eeae28..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_NormalDistribution.gif
deleted file mode 100644
index 1010ed82e50374c77a8a0d88ea93f182fd9dfbb4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Power.gif
deleted file mode 100644
index b9c0cab08bc0a6bf8324584ed33f0dc5bf1e5da5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_ProbabilityMassFunction.gif
deleted file mode 100644
index 822c544671bf421833386e40d0121d6dbb20b120..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Product.gif
deleted file mode 100644
index 539282628a7e969261bc0994edd169be63eeae28..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Term.gif
deleted file mode 100644
index 4d10d577799a0407a8112dbd0d90fb6a5b446af6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_UnaryBooleanExpression.gif
deleted file mode 100644
index 5217be62850c1c0a3e804b9a394cfbe9da399dcd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_left_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BinaryBooleanExpression.gif
deleted file mode 100644
index 6153c8dfcbb5bf74fcfd547e96699c6daf8b6bca..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BooleanLiteral.gif
deleted file mode 100644
index 4ec7362a76edfdda6fd5c3df0fd86745b5428e12..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BoxedPDF.gif
deleted file mode 100644
index fe0e4b2b82e6066937d4eb71e085a14fc08a7399..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Comparison.gif
deleted file mode 100644
index b9c0cab08bc0a6bf8324584ed33f0dc5bf1e5da5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_DoubleLiteral.gif
deleted file mode 100644
index 7e487021af0d3dd87f258c62e08efcfd91ee8858..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_ExponentialDistribution.gif
deleted file mode 100644
index c565965f8fcf5d4e3dd4075d22170487bf8a19f4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_FormalParameter.gif
deleted file mode 100644
index c0ac967d854aea6a6b29133ad69e8418e1bd5836..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Function.gif
deleted file mode 100644
index fe0e4b2b82e6066937d4eb71e085a14fc08a7399..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_IfElseExpression.gif
deleted file mode 100644
index 98a66f134f020b6ada9f93b8ac04713fd7b3c813..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_IntLiteral.gif
deleted file mode 100644
index 539282628a7e969261bc0994edd169be63eeae28..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_NormalDistribution.gif
deleted file mode 100644
index 1010ed82e50374c77a8a0d88ea93f182fd9dfbb4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Power.gif
deleted file mode 100644
index b9c0cab08bc0a6bf8324584ed33f0dc5bf1e5da5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_ProbabilityMassFunction.gif
deleted file mode 100644
index 822c544671bf421833386e40d0121d6dbb20b120..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Product.gif
deleted file mode 100644
index 539282628a7e969261bc0994edd169be63eeae28..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Term.gif
deleted file mode 100644
index 4d10d577799a0407a8112dbd0d90fb6a5b446af6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_UnaryBooleanExpression.gif
deleted file mode 100644
index 5217be62850c1c0a3e804b9a394cfbe9da399dcd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBinaryBooleanExpression_right_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBoolSampleList_items_BoolSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBoolSampleList_items_BoolSample.gif
deleted file mode 100644
index b6bdc3869b057fbd574b64c38a85d8b80bc06f68..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBoolSampleList_items_BoolSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBoxedPDF_sample_ContinuousSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBoxedPDF_sample_ContinuousSample.gif
deleted file mode 100644
index 388fb52f1e2049dff174ff2a29e88a1d19c96cae..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBoxedPDF_sample_ContinuousSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBranchAction_branchProbabilities_BranchProbabilities.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBranchAction_branchProbabilities_BranchProbabilities.gif
deleted file mode 100644
index 08b62b9af29ea343d501ce0ba5c87e57af6c8edb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBranchAction_branchProbabilities_BranchProbabilities.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBranchAction_branches_ComponentInternalBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBranchAction_branches_ComponentInternalBehavior.gif
deleted file mode 100644
index 561e20c16f11bcad56ed8fc8d1854ce82c8ad336..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateBranchAction_branches_ComponentInternalBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateCoarseGrainedBehavior_externalCallFrequency_ExternalCallFrequency.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateCoarseGrainedBehavior_externalCallFrequency_ExternalCallFrequency.gif
deleted file mode 100644
index ca92866c7c7c0fb603c4d3e7cd4178d3fd27fa60..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateCoarseGrainedBehavior_externalCallFrequency_ExternalCallFrequency.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BinaryBooleanExpression.gif
deleted file mode 100644
index 8b41d35c74d4e99b46edbe11dabaa4977556bd89..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BooleanLiteral.gif
deleted file mode 100644
index 79a0b583136b39863ef161953ac6b8b2415723f9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BoxedPDF.gif
deleted file mode 100644
index f4369fd0a4e279f9038fd569299dca091c0adec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Comparison.gif
deleted file mode 100644
index 3744cee6aecf55e4ca927e288d505ed20309ab19..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_DoubleLiteral.gif
deleted file mode 100644
index f11ad8983f40c1bf791d3530e425f8b69dd81339..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_ExponentialDistribution.gif
deleted file mode 100644
index 7acbca393c021e295ffe87c630d705272c87c73c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_FormalParameter.gif
deleted file mode 100644
index 72a560fe4a20eeaec2d85131af777c8f68e86c4e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Function.gif
deleted file mode 100644
index f4369fd0a4e279f9038fd569299dca091c0adec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_IfElseExpression.gif
deleted file mode 100644
index c8804a9339337ed84b5ccbb48b6c7907c41b45da..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_IntLiteral.gif
deleted file mode 100644
index 66cbc4c04812c284aa31798c94ad16de8cb8b5cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_NormalDistribution.gif
deleted file mode 100644
index 2d3a78e68de7e4f8ea5ffa36e2c650ec9bc1c61f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Power.gif
deleted file mode 100644
index 3744cee6aecf55e4ca927e288d505ed20309ab19..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_ProbabilityMassFunction.gif
deleted file mode 100644
index 506a19bf586b9a22bcaf4bdfac52b7a211515a53..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Product.gif
deleted file mode 100644
index 66cbc4c04812c284aa31798c94ad16de8cb8b5cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Term.gif
deleted file mode 100644
index a2ea8fe4fb00ce181ff32e3e618125fd43a4fa29..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_UnaryBooleanExpression.gif
deleted file mode 100644
index 0c070475d5d3eb93f7c7217f8f3e985d1ef83077..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_left_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BinaryBooleanExpression.gif
deleted file mode 100644
index 8b41d35c74d4e99b46edbe11dabaa4977556bd89..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BooleanLiteral.gif
deleted file mode 100644
index 79a0b583136b39863ef161953ac6b8b2415723f9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BoxedPDF.gif
deleted file mode 100644
index f4369fd0a4e279f9038fd569299dca091c0adec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Comparison.gif
deleted file mode 100644
index 3744cee6aecf55e4ca927e288d505ed20309ab19..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_DoubleLiteral.gif
deleted file mode 100644
index f11ad8983f40c1bf791d3530e425f8b69dd81339..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_ExponentialDistribution.gif
deleted file mode 100644
index 7acbca393c021e295ffe87c630d705272c87c73c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_FormalParameter.gif
deleted file mode 100644
index 72a560fe4a20eeaec2d85131af777c8f68e86c4e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Function.gif
deleted file mode 100644
index f4369fd0a4e279f9038fd569299dca091c0adec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_IfElseExpression.gif
deleted file mode 100644
index c8804a9339337ed84b5ccbb48b6c7907c41b45da..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_IntLiteral.gif
deleted file mode 100644
index 66cbc4c04812c284aa31798c94ad16de8cb8b5cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_NormalDistribution.gif
deleted file mode 100644
index 2d3a78e68de7e4f8ea5ffa36e2c650ec9bc1c61f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Power.gif
deleted file mode 100644
index 3744cee6aecf55e4ca927e288d505ed20309ab19..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_ProbabilityMassFunction.gif
deleted file mode 100644
index 506a19bf586b9a22bcaf4bdfac52b7a211515a53..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Product.gif
deleted file mode 100644
index 66cbc4c04812c284aa31798c94ad16de8cb8b5cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Term.gif
deleted file mode 100644
index a2ea8fe4fb00ce181ff32e3e618125fd43a4fa29..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_UnaryBooleanExpression.gif
deleted file mode 100644
index 0c070475d5d3eb93f7c7217f8f3e985d1ef83077..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComparison_right_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_AcquireAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_AcquireAction.gif
deleted file mode 100644
index 38e8cc2ed101d225c6b37ca7a9dbcf5e850964d2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_AcquireAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_BranchAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_BranchAction.gif
deleted file mode 100644
index 63dbadf56c1af14114366d6697983a0f50002383..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_BranchAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ExternalCallAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ExternalCallAction.gif
deleted file mode 100644
index e81c185d38b35ce49942524d635ef2c98a61fb79..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ExternalCallAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ForkAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ForkAction.gif
deleted file mode 100644
index f7a01deebad20b92a21abcdb077dceb55be93ac9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ForkAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_InternalAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_InternalAction.gif
deleted file mode 100644
index 43035507eedd309b9910045b7f9e30f0fc0f3463..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_InternalAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_LoopAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_LoopAction.gif
deleted file mode 100644
index e81c185d38b35ce49942524d635ef2c98a61fb79..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_LoopAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ReleaseAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ReleaseAction.gif
deleted file mode 100644
index 05dc6202681644db2106daa7cdfb8c35be612215..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComponentInternalBehavior_actions_ReleaseAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComposedStructure_assemblyConnectors_AssemblyConnector.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComposedStructure_assemblyConnectors_AssemblyConnector.gif
deleted file mode 100644
index 1264e5e43bcba74cdc2b994b5378f2243933f837..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComposedStructure_assemblyConnectors_AssemblyConnector.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComposedStructure_assemblyContexts_AssemblyContext.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComposedStructure_assemblyContexts_AssemblyContext.gif
deleted file mode 100644
index b0b8b572db5e6bef45771670672f3610690329c5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateComposedStructure_assemblyContexts_AssemblyContext.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateCompositeDataType_innerDeclarations_InnerDeclaration.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateCompositeDataType_innerDeclarations_InnerDeclaration.gif
deleted file mode 100644
index e279dec056fbe4b50037776c91154dd8baa267cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateCompositeDataType_innerDeclarations_InnerDeclaration.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateDoubleSampleList_items_DoubleSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateDoubleSampleList_items_DoubleSample.gif
deleted file mode 100644
index 6e87a232021b899090f3a47cc3af536add4cf89b..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateDoubleSampleList_items_DoubleSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateEnumSampleList_items_EnumSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateEnumSampleList_items_EnumSample.gif
deleted file mode 100644
index 1f3ec4289f0ec49374f81098c47632ef2e190133..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateEnumSampleList_items_EnumSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_externalCall_ExternalCall.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_externalCall_ExternalCall.gif
deleted file mode 100644
index 027f1b702718a54abdad340f25abd1f6f0f8419f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_externalCall_ExternalCall.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_externalCall_ExternalCallAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_externalCall_ExternalCallAction.gif
deleted file mode 100644
index d08a6f84a0349c6c6d745bd33039a9674db30fdb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_externalCall_ExternalCallAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_frequency_CallFrequency.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_frequency_CallFrequency.gif
deleted file mode 100644
index a8861542f93fe939b6541db275cf7a9314565442..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateExternalCallFrequency_frequency_CallFrequency.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFineGrainedBehavior_behavior_ComponentInternalBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFineGrainedBehavior_behavior_ComponentInternalBehavior.gif
deleted file mode 100644
index 40e5eedcdbe510e8293fc0f4ba1eadebb701805c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFineGrainedBehavior_behavior_ComponentInternalBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateForkAction_forkedBehaviors_ComponentInternalBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateForkAction_forkedBehaviors_ComponentInternalBehavior.gif
deleted file mode 100644
index e268a9e4429250b626a3bc50a1dc7fb68295c2c2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateForkAction_forkedBehaviors_ComponentInternalBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BinaryBooleanExpression.gif
deleted file mode 100644
index f61f1983011465fb694356efbdca7452b94f81ce..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BooleanLiteral.gif
deleted file mode 100644
index a163af34f267844b121ad8f81ed8c357a9792b2e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BoxedPDF.gif
deleted file mode 100644
index 8966d1170904f3105bdc7267a8b67ad1b7c5b27c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Comparison.gif
deleted file mode 100644
index 1b402369f15786aaffd55f7567877f6922f8e7c6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_DoubleLiteral.gif
deleted file mode 100644
index 7936184f76ea9bfbd5bb1ad60b6b19feefe52ec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_ExponentialDistribution.gif
deleted file mode 100644
index bd2a29ab6f1c79d7d460bd7181ff2ef6f96feb91..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_FormalParameter.gif
deleted file mode 100644
index 5d2a1980b82f0d9f03bc8b546babbfbfb34125da..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Function.gif
deleted file mode 100644
index 8966d1170904f3105bdc7267a8b67ad1b7c5b27c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_IfElseExpression.gif
deleted file mode 100644
index 9d46aad43a1956bd0ad1e024d11c53c591303e55..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_IntLiteral.gif
deleted file mode 100644
index 0b417a5937218fd30d9525e730a1d219cf169629..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_NormalDistribution.gif
deleted file mode 100644
index 063a8534d3e95cf65b984bb4bbc2714b1433fc7c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Power.gif
deleted file mode 100644
index 1b402369f15786aaffd55f7567877f6922f8e7c6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_ProbabilityMassFunction.gif
deleted file mode 100644
index 7b2c0939bd6bdeca02531aa0e4aaea8e716a74d3..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Product.gif
deleted file mode 100644
index 0b417a5937218fd30d9525e730a1d219cf169629..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Term.gif
deleted file mode 100644
index 59763f447c16316d2a761cf78707e3cb70653ef8..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_UnaryBooleanExpression.gif
deleted file mode 100644
index d2b476631944606c6e65384e5e1bde5d12181dd5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateFunction_parameters_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BinaryBooleanExpression.gif
deleted file mode 100644
index 55d7be5a9128f0d36af3f3cc3b8845552495c686..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BooleanLiteral.gif
deleted file mode 100644
index 66a52f706ce3c45ef529352b1ec3ba414051d035..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BoxedPDF.gif
deleted file mode 100644
index a18b783b5acd8150d28ea34c09a49bc924ef82bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Comparison.gif
deleted file mode 100644
index 2b447c2433a351d5178a946f0186d6daea227c7d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_DoubleLiteral.gif
deleted file mode 100644
index 68ad5bdffffa9420bbdc0df4f6f0f96fdc1c17bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_ExponentialDistribution.gif
deleted file mode 100644
index 96cdc6db4b6a247f64a9aea357ac56dc6814e2e6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_FormalParameter.gif
deleted file mode 100644
index 3bc59373400ad70d5d73874659d7a3f11e9ce4db..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Function.gif
deleted file mode 100644
index a18b783b5acd8150d28ea34c09a49bc924ef82bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_IfElseExpression.gif
deleted file mode 100644
index f809a28cc7227bf020f4f5d0187bb1ce201458d5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_IntLiteral.gif
deleted file mode 100644
index cbc9f8d4452a84872fb2b3fd6aba108fac48d276..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_NormalDistribution.gif
deleted file mode 100644
index 278cd8af6a478ccfbaa39620e52662730c0b2187..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Power.gif
deleted file mode 100644
index 2b447c2433a351d5178a946f0186d6daea227c7d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_ProbabilityMassFunction.gif
deleted file mode 100644
index 1b76a8a7e8193b06280007dec31fe041784f4477..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Product.gif
deleted file mode 100644
index cbc9f8d4452a84872fb2b3fd6aba108fac48d276..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Term.gif
deleted file mode 100644
index c6407cdae5f3df5dff418abff0c5584771712f2d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_UnaryBooleanExpression.gif
deleted file mode 100644
index 5206c2e2d481cc58be6d48f50e5a5b70b8c259ef..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_condition_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BinaryBooleanExpression.gif
deleted file mode 100644
index 55d7be5a9128f0d36af3f3cc3b8845552495c686..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BooleanLiteral.gif
deleted file mode 100644
index 66a52f706ce3c45ef529352b1ec3ba414051d035..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BoxedPDF.gif
deleted file mode 100644
index a18b783b5acd8150d28ea34c09a49bc924ef82bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Comparison.gif
deleted file mode 100644
index 2b447c2433a351d5178a946f0186d6daea227c7d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_DoubleLiteral.gif
deleted file mode 100644
index 68ad5bdffffa9420bbdc0df4f6f0f96fdc1c17bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_ExponentialDistribution.gif
deleted file mode 100644
index 96cdc6db4b6a247f64a9aea357ac56dc6814e2e6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_FormalParameter.gif
deleted file mode 100644
index 3bc59373400ad70d5d73874659d7a3f11e9ce4db..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Function.gif
deleted file mode 100644
index a18b783b5acd8150d28ea34c09a49bc924ef82bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_IfElseExpression.gif
deleted file mode 100644
index f809a28cc7227bf020f4f5d0187bb1ce201458d5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_IntLiteral.gif
deleted file mode 100644
index cbc9f8d4452a84872fb2b3fd6aba108fac48d276..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_NormalDistribution.gif
deleted file mode 100644
index 278cd8af6a478ccfbaa39620e52662730c0b2187..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Power.gif
deleted file mode 100644
index 2b447c2433a351d5178a946f0186d6daea227c7d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_ProbabilityMassFunction.gif
deleted file mode 100644
index 1b76a8a7e8193b06280007dec31fe041784f4477..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Product.gif
deleted file mode 100644
index cbc9f8d4452a84872fb2b3fd6aba108fac48d276..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Term.gif
deleted file mode 100644
index c6407cdae5f3df5dff418abff0c5584771712f2d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_UnaryBooleanExpression.gif
deleted file mode 100644
index 5206c2e2d481cc58be6d48f50e5a5b70b8c259ef..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_falseExp_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BinaryBooleanExpression.gif
deleted file mode 100644
index 55d7be5a9128f0d36af3f3cc3b8845552495c686..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BooleanLiteral.gif
deleted file mode 100644
index 66a52f706ce3c45ef529352b1ec3ba414051d035..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BoxedPDF.gif
deleted file mode 100644
index a18b783b5acd8150d28ea34c09a49bc924ef82bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Comparison.gif
deleted file mode 100644
index 2b447c2433a351d5178a946f0186d6daea227c7d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_DoubleLiteral.gif
deleted file mode 100644
index 68ad5bdffffa9420bbdc0df4f6f0f96fdc1c17bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_ExponentialDistribution.gif
deleted file mode 100644
index 96cdc6db4b6a247f64a9aea357ac56dc6814e2e6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_FormalParameter.gif
deleted file mode 100644
index 3bc59373400ad70d5d73874659d7a3f11e9ce4db..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Function.gif
deleted file mode 100644
index a18b783b5acd8150d28ea34c09a49bc924ef82bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_IfElseExpression.gif
deleted file mode 100644
index f809a28cc7227bf020f4f5d0187bb1ce201458d5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_IntLiteral.gif
deleted file mode 100644
index cbc9f8d4452a84872fb2b3fd6aba108fac48d276..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_NormalDistribution.gif
deleted file mode 100644
index 278cd8af6a478ccfbaa39620e52662730c0b2187..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Power.gif
deleted file mode 100644
index 2b447c2433a351d5178a946f0186d6daea227c7d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_ProbabilityMassFunction.gif
deleted file mode 100644
index 1b76a8a7e8193b06280007dec31fe041784f4477..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Product.gif
deleted file mode 100644
index cbc9f8d4452a84872fb2b3fd6aba108fac48d276..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Term.gif
deleted file mode 100644
index c6407cdae5f3df5dff418abff0c5584771712f2d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_UnaryBooleanExpression.gif
deleted file mode 100644
index 5206c2e2d481cc58be6d48f50e5a5b70b8c259ef..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIfElseExpression_trueExp_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIntSampleList_items_IntSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIntSampleList_items_IntSample.gif
deleted file mode 100644
index 58e344bde6e67edf637479de523bc72b9485e0f3..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateIntSampleList_items_IntSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterfaceProvidingEntity_blackBoxBehavior_BlackBoxBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterfaceProvidingEntity_blackBoxBehavior_BlackBoxBehavior.gif
deleted file mode 100644
index 7f3140706575745c5706a629156c3511075bf5f5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterfaceProvidingEntity_blackBoxBehavior_BlackBoxBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterfaceProvidingRequiringEntity_coarseGrainedBehavior_CoarseGrainedBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterfaceProvidingRequiringEntity_coarseGrainedBehavior_CoarseGrainedBehavior.gif
deleted file mode 100644
index 2a8a6d1e38bb13d6fa2ac65f9f78c8862a761a28..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterfaceProvidingRequiringEntity_coarseGrainedBehavior_CoarseGrainedBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterface_signatures_Signature.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterface_signatures_Signature.gif
deleted file mode 100644
index ee915d49e60111fe4f541f493f9a78e9230aee0a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateInterface_signatures_Signature.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateLoopAction_loopBodyBehavior_ComponentInternalBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateLoopAction_loopBodyBehavior_ComponentInternalBehavior.gif
deleted file mode 100644
index 9e4b0fb72072c8f6f9cb738d6722aa174db6a9e1..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateLoopAction_loopBodyBehavior_ComponentInternalBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateLoopAction_loopIterationCountDistribution_LoopIterationCountDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateLoopAction_loopIterationCountDistribution_LoopIterationCountDistribution.gif
deleted file mode 100644
index 49d98d937adca33420af6b8a14e9d8debe501fd3..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateLoopAction_loopIterationCountDistribution_LoopIterationCountDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BinaryBooleanExpression.gif
deleted file mode 100644
index 8b41d35c74d4e99b46edbe11dabaa4977556bd89..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BooleanLiteral.gif
deleted file mode 100644
index 79a0b583136b39863ef161953ac6b8b2415723f9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BoxedPDF.gif
deleted file mode 100644
index f4369fd0a4e279f9038fd569299dca091c0adec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Comparison.gif
deleted file mode 100644
index 3744cee6aecf55e4ca927e288d505ed20309ab19..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_DoubleLiteral.gif
deleted file mode 100644
index f11ad8983f40c1bf791d3530e425f8b69dd81339..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_ExponentialDistribution.gif
deleted file mode 100644
index 7acbca393c021e295ffe87c630d705272c87c73c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_FormalParameter.gif
deleted file mode 100644
index 72a560fe4a20eeaec2d85131af777c8f68e86c4e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Function.gif
deleted file mode 100644
index f4369fd0a4e279f9038fd569299dca091c0adec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_IfElseExpression.gif
deleted file mode 100644
index c8804a9339337ed84b5ccbb48b6c7907c41b45da..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_IntLiteral.gif
deleted file mode 100644
index 66cbc4c04812c284aa31798c94ad16de8cb8b5cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_NormalDistribution.gif
deleted file mode 100644
index 2d3a78e68de7e4f8ea5ffa36e2c650ec9bc1c61f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Power.gif
deleted file mode 100644
index 3744cee6aecf55e4ca927e288d505ed20309ab19..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_ProbabilityMassFunction.gif
deleted file mode 100644
index 506a19bf586b9a22bcaf4bdfac52b7a211515a53..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Product.gif
deleted file mode 100644
index 66cbc4c04812c284aa31798c94ad16de8cb8b5cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Term.gif
deleted file mode 100644
index a2ea8fe4fb00ce181ff32e3e618125fd43a4fa29..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_UnaryBooleanExpression.gif
deleted file mode 100644
index 0c070475d5d3eb93f7c7217f8f3e985d1ef83077..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_base_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BinaryBooleanExpression.gif
deleted file mode 100644
index 8b41d35c74d4e99b46edbe11dabaa4977556bd89..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BooleanLiteral.gif
deleted file mode 100644
index 79a0b583136b39863ef161953ac6b8b2415723f9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BoxedPDF.gif
deleted file mode 100644
index f4369fd0a4e279f9038fd569299dca091c0adec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Comparison.gif
deleted file mode 100644
index 3744cee6aecf55e4ca927e288d505ed20309ab19..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_DoubleLiteral.gif
deleted file mode 100644
index f11ad8983f40c1bf791d3530e425f8b69dd81339..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_ExponentialDistribution.gif
deleted file mode 100644
index 7acbca393c021e295ffe87c630d705272c87c73c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_FormalParameter.gif
deleted file mode 100644
index 72a560fe4a20eeaec2d85131af777c8f68e86c4e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Function.gif
deleted file mode 100644
index f4369fd0a4e279f9038fd569299dca091c0adec7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_IfElseExpression.gif
deleted file mode 100644
index c8804a9339337ed84b5ccbb48b6c7907c41b45da..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_IntLiteral.gif
deleted file mode 100644
index 66cbc4c04812c284aa31798c94ad16de8cb8b5cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_NormalDistribution.gif
deleted file mode 100644
index 2d3a78e68de7e4f8ea5ffa36e2c650ec9bc1c61f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Power.gif
deleted file mode 100644
index 3744cee6aecf55e4ca927e288d505ed20309ab19..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_ProbabilityMassFunction.gif
deleted file mode 100644
index 506a19bf586b9a22bcaf4bdfac52b7a211515a53..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Product.gif
deleted file mode 100644
index 66cbc4c04812c284aa31798c94ad16de8cb8b5cd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Term.gif
deleted file mode 100644
index a2ea8fe4fb00ce181ff32e3e618125fd43a4fa29..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_UnaryBooleanExpression.gif
deleted file mode 100644
index 0c070475d5d3eb93f7c7217f8f3e985d1ef83077..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreatePower_exponent_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_BoolSampleList.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_BoolSampleList.gif
deleted file mode 100644
index 29f98e74f3139e4f7fb6bb50c7d71dc24cb4a917..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_BoolSampleList.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_DoubleSampleList.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_DoubleSampleList.gif
deleted file mode 100644
index 431ba00e4299e1710a110f10d373136688af69dc..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_DoubleSampleList.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_EnumSampleList.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_EnumSampleList.gif
deleted file mode 100644
index 3da98f774369141f4654a5bcd2bbcdb33eadef6e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_EnumSampleList.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_IntSampleList.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_IntSampleList.gif
deleted file mode 100644
index 59e174d67ca4d29995fbe4aba5a797f67e4d0c98..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProbabilityMassFunction_samples_IntSampleList.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BinaryBooleanExpression.gif
deleted file mode 100644
index 0f9364baeebd68fcf2f2dec0086bb32bb281d282..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BooleanLiteral.gif
deleted file mode 100644
index 57dceaeb0fe00cb3a7cc923a564d7c886b03b40d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BoxedPDF.gif
deleted file mode 100644
index 75937a9df9fa9ac9e2f7ccbb603bc58ddd3aac77..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Comparison.gif
deleted file mode 100644
index c819bceac85b17d6ddf4528634b1c9eade85f3c8..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_DoubleLiteral.gif
deleted file mode 100644
index 4833facbbbe2e81dbf0a255d06a51ec1c7580442..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_ExponentialDistribution.gif
deleted file mode 100644
index a8861542f93fe939b6541db275cf7a9314565442..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_FormalParameter.gif
deleted file mode 100644
index 16301136d1900ee7e82fcba9ce78e7211e6ee42d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Function.gif
deleted file mode 100644
index 75937a9df9fa9ac9e2f7ccbb603bc58ddd3aac77..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_IfElseExpression.gif
deleted file mode 100644
index 794791ad9f0ed2e2b2ef655bbc8a37934f7733e3..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_IntLiteral.gif
deleted file mode 100644
index d08a6f84a0349c6c6d745bd33039a9674db30fdb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_NormalDistribution.gif
deleted file mode 100644
index 94fcc9b70088516f072b5053844526c811159300..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Power.gif
deleted file mode 100644
index c819bceac85b17d6ddf4528634b1c9eade85f3c8..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_ProbabilityMassFunction.gif
deleted file mode 100644
index 171603a7477054ce1620bba297b31810f90f07e9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Product.gif
deleted file mode 100644
index d08a6f84a0349c6c6d745bd33039a9674db30fdb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Term.gif
deleted file mode 100644
index babb084892c4d14f28525b05b99b0ecd71c070ed..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_UnaryBooleanExpression.gif
deleted file mode 100644
index cf6dfd56a6d651e98ec7c60e9aec23851457687f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_left_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BinaryBooleanExpression.gif
deleted file mode 100644
index 0f9364baeebd68fcf2f2dec0086bb32bb281d282..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BooleanLiteral.gif
deleted file mode 100644
index 57dceaeb0fe00cb3a7cc923a564d7c886b03b40d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BoxedPDF.gif
deleted file mode 100644
index 75937a9df9fa9ac9e2f7ccbb603bc58ddd3aac77..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Comparison.gif
deleted file mode 100644
index c819bceac85b17d6ddf4528634b1c9eade85f3c8..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_DoubleLiteral.gif
deleted file mode 100644
index 4833facbbbe2e81dbf0a255d06a51ec1c7580442..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_ExponentialDistribution.gif
deleted file mode 100644
index a8861542f93fe939b6541db275cf7a9314565442..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_FormalParameter.gif
deleted file mode 100644
index 16301136d1900ee7e82fcba9ce78e7211e6ee42d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Function.gif
deleted file mode 100644
index 75937a9df9fa9ac9e2f7ccbb603bc58ddd3aac77..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_IfElseExpression.gif
deleted file mode 100644
index 794791ad9f0ed2e2b2ef655bbc8a37934f7733e3..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_IntLiteral.gif
deleted file mode 100644
index d08a6f84a0349c6c6d745bd33039a9674db30fdb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_NormalDistribution.gif
deleted file mode 100644
index 94fcc9b70088516f072b5053844526c811159300..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Power.gif
deleted file mode 100644
index c819bceac85b17d6ddf4528634b1c9eade85f3c8..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_ProbabilityMassFunction.gif
deleted file mode 100644
index 171603a7477054ce1620bba297b31810f90f07e9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Product.gif
deleted file mode 100644
index d08a6f84a0349c6c6d745bd33039a9674db30fdb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Term.gif
deleted file mode 100644
index babb084892c4d14f28525b05b99b0ecd71c070ed..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_UnaryBooleanExpression.gif
deleted file mode 100644
index cf6dfd56a6d651e98ec7c60e9aec23851457687f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateProduct_right_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_BasicComponent.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_BasicComponent.gif
deleted file mode 100644
index 89d8767bf56c38fd34720d1577c45b61dc8817ca..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_BasicComponent.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_CompositeComponent.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_CompositeComponent.gif
deleted file mode 100644
index 9b19f705944427e17a1e9dcb69b79d3466837f80..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_CompositeComponent.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_SubSystem.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_SubSystem.gif
deleted file mode 100644
index ec9a814da6c63196082a15ae263ced39edef2bcb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_components_SubSystem.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_datatypes_CollectionDataType.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_datatypes_CollectionDataType.gif
deleted file mode 100644
index a1607f910083346345671e52588d6acdb6f1dd0f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_datatypes_CollectionDataType.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_datatypes_CompositeDataType.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_datatypes_CompositeDataType.gif
deleted file mode 100644
index d415ad7a8c90ab0d2815152c2b5b5d21547ecb7a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_datatypes_CompositeDataType.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_imports_Import.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_imports_Import.gif
deleted file mode 100644
index 381214b7725a0ba12c093604e1b4bf4c563cc604..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_imports_Import.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_interfaces_Interface.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_interfaces_Interface.gif
deleted file mode 100644
index 396a4d777ec58bb09a606e602d9361edefe10f20..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateRepository_interfaces_Interface.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ExternalCallParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ExternalCallParameter.gif
deleted file mode 100644
index 776c80f6941746bf9722ccfc686f54495ade6cd7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ExternalCallParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ExternalCallReturnParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ExternalCallReturnParameter.gif
deleted file mode 100644
index 961acc569eeb7e4c29325471ff08355036e604fd..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ExternalCallReturnParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_InfluencingParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_InfluencingParameter.gif
deleted file mode 100644
index 201f4af13be14a8275afe17377fb83ecff18dfd2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_InfluencingParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ServiceInputParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ServiceInputParameter.gif
deleted file mode 100644
index b7e2f30c26a2406b1f2f4addcc24ad457934b4de..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateServiceBehaviorAbstraction_influencingParameter_ServiceInputParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateSignature_parameters_Parameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateSignature_parameters_Parameter.gif
deleted file mode 100644
index 3090830045ce6bf1b0f2f3100b6322a6e93d4eda..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateSignature_parameters_Parameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BinaryBooleanExpression.gif
deleted file mode 100644
index 04aab9257b410114d814aa6c4591dbf71f20b349..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BooleanLiteral.gif
deleted file mode 100644
index 9ac141af672d33e778eb5683c7ada59c0c468c93..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BoxedPDF.gif
deleted file mode 100644
index 468d5f998b24bae07fbaae0ca702b830f9a635c2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Comparison.gif
deleted file mode 100644
index 28ad8b8deeeb6d4b57a3c7226967bac0e0d632b5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_DoubleLiteral.gif
deleted file mode 100644
index 12ec17b7cf21b8fa552e66383c5d5ffc0f473328..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_ExponentialDistribution.gif
deleted file mode 100644
index 8b42bd7b416b8f97563664cd539a9b6a73cfe0df..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_FormalParameter.gif
deleted file mode 100644
index 0d8e38fd5b70a70ce1dcade2f13fa443cd5a5e6f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Function.gif
deleted file mode 100644
index 468d5f998b24bae07fbaae0ca702b830f9a635c2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_IfElseExpression.gif
deleted file mode 100644
index 6875c5d9205616b899b4aea3b33f6b9b41138bcf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_IntLiteral.gif
deleted file mode 100644
index e8bebbfd88d81d8a817b103676a9119729aaa37a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_NormalDistribution.gif
deleted file mode 100644
index d415ad7a8c90ab0d2815152c2b5b5d21547ecb7a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Power.gif
deleted file mode 100644
index 28ad8b8deeeb6d4b57a3c7226967bac0e0d632b5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_ProbabilityMassFunction.gif
deleted file mode 100644
index 942aab31ac211bec367f60f03e1ff847bb4ba5aa..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Product.gif
deleted file mode 100644
index e8bebbfd88d81d8a817b103676a9119729aaa37a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Term.gif
deleted file mode 100644
index a1607f910083346345671e52588d6acdb6f1dd0f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_UnaryBooleanExpression.gif
deleted file mode 100644
index 74f7ceb34b938a5d45117b8b00f03c067b4a51a8..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_left_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BinaryBooleanExpression.gif
deleted file mode 100644
index 04aab9257b410114d814aa6c4591dbf71f20b349..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BooleanLiteral.gif
deleted file mode 100644
index 9ac141af672d33e778eb5683c7ada59c0c468c93..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BoxedPDF.gif
deleted file mode 100644
index 468d5f998b24bae07fbaae0ca702b830f9a635c2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Comparison.gif
deleted file mode 100644
index 28ad8b8deeeb6d4b57a3c7226967bac0e0d632b5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_DoubleLiteral.gif
deleted file mode 100644
index 12ec17b7cf21b8fa552e66383c5d5ffc0f473328..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_ExponentialDistribution.gif
deleted file mode 100644
index 8b42bd7b416b8f97563664cd539a9b6a73cfe0df..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_FormalParameter.gif
deleted file mode 100644
index 0d8e38fd5b70a70ce1dcade2f13fa443cd5a5e6f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Function.gif
deleted file mode 100644
index 468d5f998b24bae07fbaae0ca702b830f9a635c2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_IfElseExpression.gif
deleted file mode 100644
index 6875c5d9205616b899b4aea3b33f6b9b41138bcf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_IntLiteral.gif
deleted file mode 100644
index e8bebbfd88d81d8a817b103676a9119729aaa37a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_NormalDistribution.gif
deleted file mode 100644
index d415ad7a8c90ab0d2815152c2b5b5d21547ecb7a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Power.gif
deleted file mode 100644
index 28ad8b8deeeb6d4b57a3c7226967bac0e0d632b5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_ProbabilityMassFunction.gif
deleted file mode 100644
index 942aab31ac211bec367f60f03e1ff847bb4ba5aa..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Product.gif
deleted file mode 100644
index e8bebbfd88d81d8a817b103676a9119729aaa37a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Term.gif
deleted file mode 100644
index a1607f910083346345671e52588d6acdb6f1dd0f..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_UnaryBooleanExpression.gif
deleted file mode 100644
index 74f7ceb34b938a5d45117b8b00f03c067b4a51a8..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateTerm_right_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BinaryBooleanExpression.gif
deleted file mode 100644
index c05a41849689a719a2c5c69a55df481451fc980a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BooleanLiteral.gif
deleted file mode 100644
index 385b36595f65a969076a1f527677d0e96cf79d51..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BoxedPDF.gif
deleted file mode 100644
index af07ba12a2bdf3e480696fa3388fd266e8ad87c3..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Comparison.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Comparison.gif
deleted file mode 100644
index 908375cea5aebb62d3cd94b436b77ed1f6dbdbda..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Comparison.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_DoubleLiteral.gif
deleted file mode 100644
index 464e623af1bec3cb9169427f8df20d5108dce5cc..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_ExponentialDistribution.gif
deleted file mode 100644
index 38d77bbab6c0d9efba0dd5521fc028ef50978388..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_FormalParameter.gif
deleted file mode 100644
index fc34e45332d798cca5ae2b823a9ca1ab4c0954c0..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Function.gif
deleted file mode 100644
index af07ba12a2bdf3e480696fa3388fd266e8ad87c3..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_IfElseExpression.gif
deleted file mode 100644
index 3423b903ca3cf68d0fc3f574b8f2ed48e5e63820..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_IntLiteral.gif
deleted file mode 100644
index 959b8924b24669468c75f3fe603543e3d2c5cc08..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_NormalDistribution.gif
deleted file mode 100644
index 9c7efc49c09f042f89d2bd727f3c1d9e788c1301..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Power.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Power.gif
deleted file mode 100644
index 908375cea5aebb62d3cd94b436b77ed1f6dbdbda..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Power.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_ProbabilityMassFunction.gif
deleted file mode 100644
index 1d2f734b1512dac405e7b55fbdba0935aec78f4b..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Product.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Product.gif
deleted file mode 100644
index 959b8924b24669468c75f3fe603543e3d2c5cc08..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Product.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Term.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Term.gif
deleted file mode 100644
index 1f8189adbeb9c651b1e073744529291b07715292..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_Term.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_UnaryBooleanExpression.gif
deleted file mode 100644
index 883ce93b4303d7e81ab88f53bb8a3a3cf3eae2e6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/ctool16/CreateUnaryBooleanExpression_inner_UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AbstractAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AbstractAction.gif
deleted file mode 100644
index f8041d22553d3f326e3e82be501f2e9bac3794b0..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AbstractAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AcquireAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AcquireAction.gif
deleted file mode 100644
index 7b7c428c715e615c179d42a8462ee953741414d4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AcquireAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AssemblyConnector.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AssemblyConnector.gif
deleted file mode 100644
index c673a5200a53ebd68c78c5cdb9d1bd4eaa855afb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AssemblyConnector.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AssemblyContext.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AssemblyContext.gif
deleted file mode 100644
index c414fe9f728a37e7a2578cf66e5d3f625b429d0e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/AssemblyContext.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BasicComponent.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BasicComponent.gif
deleted file mode 100644
index d3dc5a9ad8159548d5ada4a1cd545ec1d4de029c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BasicComponent.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BinaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BinaryBooleanExpression.gif
deleted file mode 100644
index 106881e5d9bf05cb0cf3375cfd102e8039b8ace9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BinaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BlackBoxBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BlackBoxBehavior.gif
deleted file mode 100644
index ed8747474012f8278002a9785026a1a40155b192..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BlackBoxBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoolSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoolSample.gif
deleted file mode 100644
index 7bac4fd3808df6247660dfb8d76e15609f279841..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoolSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoolSampleList.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoolSampleList.gif
deleted file mode 100644
index c8d381f0b327e1289745a7e8ea72b5cc7b782bfe..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoolSampleList.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BooleanLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BooleanLiteral.gif
deleted file mode 100644
index 05dc74ad5da0d7b040b29537d5b24f2b120b11d5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BooleanLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoxedPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoxedPDF.gif
deleted file mode 100644
index c00aedf4135a384d1a98a5344c27454f488cbe42..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BoxedPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BranchAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BranchAction.gif
deleted file mode 100644
index 8a5c70cbd74c87cb3b1df383e0c242ede4660c3b..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BranchAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BranchProbabilities.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BranchProbabilities.gif
deleted file mode 100644
index 4365960a04b1589a21b7607f45f9b5907e2f01a8..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/BranchProbabilities.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CallFrequency.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CallFrequency.gif
deleted file mode 100644
index c414fe9f728a37e7a2578cf66e5d3f625b429d0e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CallFrequency.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CoarseGrainedBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CoarseGrainedBehavior.gif
deleted file mode 100644
index 45731fe28e7e3521c15328ef201d58b47a13b383..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CoarseGrainedBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CollectionDataType.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CollectionDataType.gif
deleted file mode 100644
index cdd3b76e3c0b3318166d84292d8d9e2146a48aa1..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CollectionDataType.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ComponentInstanceReference.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ComponentInstanceReference.gif
deleted file mode 100644
index 33854e98c25a13543eb9477dc67b0baf87fc81aa..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ComponentInstanceReference.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ComponentInternalBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ComponentInternalBehavior.gif
deleted file mode 100644
index c3370c7ddd5e0817a59de6fd45ad0993b52abe28..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ComponentInternalBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CompositeComponent.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CompositeComponent.gif
deleted file mode 100644
index a26660ec28fda4a4216562537c32047bab42b782..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CompositeComponent.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CompositeDataType.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CompositeDataType.gif
deleted file mode 100644
index 35ef84e20e26f1cef1dcd7ae80d192fd40472368..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CompositeDataType.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ContinuousPDF.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ContinuousPDF.gif
deleted file mode 100644
index 1e5345fb3237c2f6eabcee2dbe44a371b49d8379..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ContinuousPDF.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ContinuousSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ContinuousSample.gif
deleted file mode 100644
index ef56c140853105ca812564e9b12a76413c8c3fb9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ContinuousSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CorrelationRelationship.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CorrelationRelationship.gif
deleted file mode 100644
index a26660ec28fda4a4216562537c32047bab42b782..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/CorrelationRelationship.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DependencyRelationship.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DependencyRelationship.gif
deleted file mode 100644
index 90d10f9470787d1465c462197b85d1d3621f84e4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DependencyRelationship.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleLiteral.gif
deleted file mode 100644
index 7b7c428c715e615c179d42a8462ee953741414d4..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleSample.gif
deleted file mode 100644
index cdd3b76e3c0b3318166d84292d8d9e2146a48aa1..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleSampleList.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleSampleList.gif
deleted file mode 100644
index 7bac4fd3808df6247660dfb8d76e15609f279841..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/DoubleSampleList.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/EnumSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/EnumSample.gif
deleted file mode 100644
index 94c953e013baf5c1efe99489cbbf6fc39dd41341..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/EnumSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/EnumSampleList.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/EnumSampleList.gif
deleted file mode 100644
index 136e3b27269e84a045f9b528614d7dfd316e444c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/EnumSampleList.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExplicitFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExplicitFunction.gif
deleted file mode 100644
index 83afb9b3c9a3c3e261dd043d2232d39254ac8e4a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExplicitFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExponentialDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExponentialDistribution.gif
deleted file mode 100644
index c414fe9f728a37e7a2578cf66e5d3f625b429d0e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExponentialDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCall.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCall.gif
deleted file mode 100644
index a17dc7d88e993e89a1d5f913ddfab16b1676c5bb..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCall.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallAction.gif
deleted file mode 100644
index caf2804510dc36959fb4e045e8af91d01229dcd7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallFrequency.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallFrequency.gif
deleted file mode 100644
index caf2804510dc36959fb4e045e8af91d01229dcd7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallFrequency.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallParameter.gif
deleted file mode 100644
index d92f34c8aea721c98537ccb1f4da29bdee3b8912..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallReturnParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallReturnParameter.gif
deleted file mode 100644
index badaab0664ae45de5d990f64638197daeabf31bf..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ExternalCallReturnParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/FineGrainedBehavior.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/FineGrainedBehavior.gif
deleted file mode 100644
index 498364f1c1ae0e61f26b0063dea3a1606959210e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/FineGrainedBehavior.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ForkAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ForkAction.gif
deleted file mode 100644
index 33854e98c25a13543eb9477dc67b0baf87fc81aa..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ForkAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/FormalParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/FormalParameter.gif
deleted file mode 100644
index 5915591825a5301b9f9a3d398baea497ef02311d..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/FormalParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Function.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Function.gif
deleted file mode 100644
index c00aedf4135a384d1a98a5344c27454f488cbe42..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Function.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IfElseExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IfElseExpression.gif
deleted file mode 100644
index be22463d2919f13a6345bad3166fc216c3f0942a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IfElseExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Import.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Import.gif
deleted file mode 100644
index 98b351f1c441775dfbe390577f2e534a4dcf07f9..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Import.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InfluencingParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InfluencingParameter.gif
deleted file mode 100644
index 94c953e013baf5c1efe99489cbbf6fc39dd41341..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InfluencingParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InnerDeclaration.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InnerDeclaration.gif
deleted file mode 100644
index 94c953e013baf5c1efe99489cbbf6fc39dd41341..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InnerDeclaration.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntLiteral.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntLiteral.gif
deleted file mode 100644
index caf2804510dc36959fb4e045e8af91d01229dcd7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntLiteral.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntSample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntSample.gif
deleted file mode 100644
index 498364f1c1ae0e61f26b0063dea3a1606959210e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntSample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntSampleList.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntSampleList.gif
deleted file mode 100644
index 134551bff7eb3f0beb14a6c4a270a2a94f782ec5..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/IntSampleList.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Interface.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Interface.gif
deleted file mode 100644
index 7bac4fd3808df6247660dfb8d76e15609f279841..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Interface.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InternalAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InternalAction.gif
deleted file mode 100644
index 498364f1c1ae0e61f26b0063dea3a1606959210e..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/InternalAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Literal.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Literal.gif
deleted file mode 100644
index d3dc5a9ad8159548d5ada4a1cd545ec1d4de029c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Literal.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/LoopAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/LoopAction.gif
deleted file mode 100644
index caf2804510dc36959fb4e045e8af91d01229dcd7..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/LoopAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/LoopIterationCountDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/LoopIterationCountDistribution.gif
deleted file mode 100644
index 30f0c48da8d4450f7e94a696c4de0a7cc41aa728..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/LoopIterationCountDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/NormalDistribution.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/NormalDistribution.gif
deleted file mode 100644
index 35ef84e20e26f1cef1dcd7ae80d192fd40472368..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/NormalDistribution.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ProbabilityDensityFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ProbabilityDensityFunction.gif
deleted file mode 100644
index b3643da048a40135b62eed5100cac5afe1ecef3c..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ProbabilityDensityFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ProbabilityMassFunction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ProbabilityMassFunction.gif
deleted file mode 100644
index ea58a657dc0c287f6bb84e6cbd38008c96713db3..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ProbabilityMassFunction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/RandomVariable.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/RandomVariable.gif
deleted file mode 100644
index 904159880b359f157463f3cb9230da602e5b3d3a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/RandomVariable.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ReleaseAction.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ReleaseAction.gif
deleted file mode 100644
index ed8747474012f8278002a9785026a1a40155b192..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ReleaseAction.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Repository.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Repository.gif
deleted file mode 100644
index cdd3b76e3c0b3318166d84292d8d9e2146a48aa1..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Repository.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/RepositoryComponent.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/RepositoryComponent.gif
deleted file mode 100644
index 94c953e013baf5c1efe99489cbbf6fc39dd41341..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/RepositoryComponent.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Sample.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Sample.gif
deleted file mode 100644
index 904159880b359f157463f3cb9230da602e5b3d3a..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Sample.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Semaphore.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Semaphore.gif
deleted file mode 100644
index 5a9bc7514facefe049e8f5d98bb2e1e37f03c0c2..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Semaphore.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ServiceInputParameter.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ServiceInputParameter.gif
deleted file mode 100644
index c4a8af418445186dec6bb4f750c13a832181fe76..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/ServiceInputParameter.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Signature.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Signature.gif
deleted file mode 100644
index cb1755a712505aeaaa447d9b1cc5940e602f87b6..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/Signature.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/SubSystem.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/SubSystem.gif
deleted file mode 100644
index 10d222998af0a3a571390bae7e117c9964ec1562..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/SubSystem.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/System.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/System.gif
deleted file mode 100644
index 89ad5da38ab3060f14ba925b1251bd5cb8454012..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/System.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/UnaryBooleanExpression.gif b/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/UnaryBooleanExpression.gif
deleted file mode 100644
index 739ebbfa6ac7b44cc1632663c006f47e20f05127..0000000000000000000000000000000000000000
Binary files a/edu.kit.ipd.descartes.mm.applicationlevel.edit/icons/full/obj16/UnaryBooleanExpression.gif and /dev/null differ
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/AtomItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/AtomItemProvider.java
deleted file mode 100644
index 5ab5adfbce58661228e3add47ed2f54466cf1eae..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/AtomItemProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Atom} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AtomItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AtomItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Atom_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BinaryBooleanExpressionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BinaryBooleanExpressionItemProvider.java
deleted file mode 100644
index ccd5c297441d715976ab8ece84ffe82b6580c28f..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BinaryBooleanExpressionItemProvider.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.BinaryBooleanExpression;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.BooleanOperation;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BinaryBooleanExpression} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BinaryBooleanExpressionItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BinaryBooleanExpressionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addOperationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Operation feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOperationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BinaryBooleanExpression_operation_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BinaryBooleanExpression_operation_feature", "_UI_BinaryBooleanExpression_type"),
-				 FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__OPERATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT);
-			childrenFeatures.add(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns BinaryBooleanExpression.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BinaryBooleanExpression"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BooleanOperation labelValue = ((BinaryBooleanExpression)object).getOperation();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_BinaryBooleanExpression_type") :
-			getString("_UI_BinaryBooleanExpression_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BinaryBooleanExpression.class)) {
-			case FunctionsPackage.BINARY_BOOLEAN_EXPRESSION__OPERATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case FunctionsPackage.BINARY_BOOLEAN_EXPRESSION__LEFT:
-			case FunctionsPackage.BINARY_BOOLEAN_EXPRESSION__RIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__LEFT ||
-			childFeature == FunctionsPackage.Literals.BINARY_BOOLEAN_EXPRESSION__RIGHT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoolSampleItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoolSampleItemProvider.java
deleted file mode 100644
index 6daa470880ace1d7b10e8f91f954c5ae288ccb88..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoolSampleItemProvider.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.BoolSample;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoolSample} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BoolSampleItemProvider
-	extends SampleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BoolSampleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-			addProbabilityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BoolSample_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BoolSample_value_feature", "_UI_BoolSample_type"),
-				 FunctionsPackage.Literals.BOOL_SAMPLE__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Probability feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProbabilityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BoolSample_probability_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BoolSample_probability_feature", "_UI_BoolSample_type"),
-				 FunctionsPackage.Literals.BOOL_SAMPLE__PROBABILITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns BoolSample.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BoolSample"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BoolSample boolSample = (BoolSample)object;
-		return getString("_UI_BoolSample_type") + " " + boolSample.isValue();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BoolSample.class)) {
-			case FunctionsPackage.BOOL_SAMPLE__VALUE:
-			case FunctionsPackage.BOOL_SAMPLE__PROBABILITY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoolSampleListItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoolSampleListItemProvider.java
deleted file mode 100644
index 79763ec8d8c45af7b01575890ea5a9c25f7783fb..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoolSampleListItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.BoolSampleList;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoolSampleList} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BoolSampleListItemProvider
-	extends SampleListItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BoolSampleListItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.BOOL_SAMPLE_LIST__ITEMS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns BoolSampleList.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BoolSampleList"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_BoolSampleList_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BoolSampleList.class)) {
-			case FunctionsPackage.BOOL_SAMPLE_LIST__ITEMS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BOOL_SAMPLE_LIST__ITEMS,
-				 FunctionsFactory.eINSTANCE.createBoolSample()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BooleanLiteralItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BooleanLiteralItemProvider.java
deleted file mode 100644
index b9d90a287f2103e92c86e8a1a60e9e0445926eb5..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BooleanLiteralItemProvider.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.BooleanLiteral;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BooleanLiteral} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BooleanLiteralItemProvider
-	extends LiteralItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BooleanLiteralItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BooleanLiteral_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BooleanLiteral_value_feature", "_UI_BooleanLiteral_type"),
-				 FunctionsPackage.Literals.BOOLEAN_LITERAL__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns BooleanLiteral.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BooleanLiteral"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BooleanLiteral booleanLiteral = (BooleanLiteral)object;
-		return getString("_UI_BooleanLiteral_type") + " " + booleanLiteral.isValue();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BooleanLiteral.class)) {
-			case FunctionsPackage.BOOLEAN_LITERAL__VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoxedPDFItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoxedPDFItemProvider.java
deleted file mode 100644
index cf9f666b332dc4054d1448424fb75e25f0941910..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/BoxedPDFItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.BoxedPDF;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoxedPDF} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BoxedPDFItemProvider
-	extends ProbabilityDensityFunctionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BoxedPDFItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.BOXED_PDF__SAMPLE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns BoxedPDF.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BoxedPDF"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_BoxedPDF_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BoxedPDF.class)) {
-			case FunctionsPackage.BOXED_PDF__SAMPLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.BOXED_PDF__SAMPLE,
-				 FunctionsFactory.eINSTANCE.createContinuousSample()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ComparisonItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ComparisonItemProvider.java
deleted file mode 100644
index dd67e7e648d35f630a33701945220fa01a33a0ab..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ComparisonItemProvider.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.CompareOperation;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.Comparison;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Comparison} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ComparisonItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComparisonItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addOperationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Operation feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOperationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Comparison_operation_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Comparison_operation_feature", "_UI_Comparison_type"),
-				 FunctionsPackage.Literals.COMPARISON__OPERATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.COMPARISON__LEFT);
-			childrenFeatures.add(FunctionsPackage.Literals.COMPARISON__RIGHT);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		CompareOperation labelValue = ((Comparison)object).getOperation();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Comparison_type") :
-			getString("_UI_Comparison_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Comparison.class)) {
-			case FunctionsPackage.COMPARISON__OPERATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case FunctionsPackage.COMPARISON__LEFT:
-			case FunctionsPackage.COMPARISON__RIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__LEFT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.COMPARISON__RIGHT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == FunctionsPackage.Literals.COMPARISON__LEFT ||
-			childFeature == FunctionsPackage.Literals.COMPARISON__RIGHT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ContinuousPDFItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ContinuousPDFItemProvider.java
deleted file mode 100644
index c25c0bcff6a168b2f9e8fdad930ed3f66ffcd733..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ContinuousPDFItemProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ContinuousPDF} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContinuousPDFItemProvider
-	extends ProbabilityDensityFunctionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContinuousPDFItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns ContinuousPDF.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ContinuousPDF"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ContinuousPDF_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ContinuousSampleItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ContinuousSampleItemProvider.java
deleted file mode 100644
index 8213947af9d8c8cef65883b84b53e1adb2687686..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ContinuousSampleItemProvider.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.ContinuousSample;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ContinuousSample} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContinuousSampleItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContinuousSampleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-			addProbabilityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ContinuousSample_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ContinuousSample_value_feature", "_UI_ContinuousSample_type"),
-				 FunctionsPackage.Literals.CONTINUOUS_SAMPLE__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Probability feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProbabilityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ContinuousSample_probability_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ContinuousSample_probability_feature", "_UI_ContinuousSample_type"),
-				 FunctionsPackage.Literals.CONTINUOUS_SAMPLE__PROBABILITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ContinuousSample.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ContinuousSample"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigDecimal labelValue = ((ContinuousSample)object).getValue();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ContinuousSample_type") :
-			getString("_UI_ContinuousSample_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ContinuousSample.class)) {
-			case FunctionsPackage.CONTINUOUS_SAMPLE__VALUE:
-			case FunctionsPackage.CONTINUOUS_SAMPLE__PROBABILITY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleLiteralItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleLiteralItemProvider.java
deleted file mode 100644
index 6b1d1d624ee738056c41be34f796f754a7795643..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleLiteralItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleLiteral;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleLiteral} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DoubleLiteralItemProvider
-	extends LiteralItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DoubleLiteralItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DoubleLiteral_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleLiteral_value_feature", "_UI_DoubleLiteral_type"),
-				 FunctionsPackage.Literals.DOUBLE_LITERAL__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns DoubleLiteral.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleLiteral"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigDecimal labelValue = ((DoubleLiteral)object).getValue();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DoubleLiteral_type") :
-			getString("_UI_DoubleLiteral_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DoubleLiteral.class)) {
-			case FunctionsPackage.DOUBLE_LITERAL__VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleSampleItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleSampleItemProvider.java
deleted file mode 100644
index a9a587bb5b0654fe9f8c4fb5c32b559fe597f175..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleSampleItemProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleSample;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleSample} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DoubleSampleItemProvider
-	extends SampleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DoubleSampleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-			addProbabilityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DoubleSample_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleSample_value_feature", "_UI_DoubleSample_type"),
-				 FunctionsPackage.Literals.DOUBLE_SAMPLE__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Probability feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProbabilityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DoubleSample_probability_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleSample_probability_feature", "_UI_DoubleSample_type"),
-				 FunctionsPackage.Literals.DOUBLE_SAMPLE__PROBABILITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns DoubleSample.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleSample"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigDecimal labelValue = ((DoubleSample)object).getValue();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DoubleSample_type") :
-			getString("_UI_DoubleSample_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DoubleSample.class)) {
-			case FunctionsPackage.DOUBLE_SAMPLE__VALUE:
-			case FunctionsPackage.DOUBLE_SAMPLE__PROBABILITY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleSampleListItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleSampleListItemProvider.java
deleted file mode 100644
index c5e107a72af1bd5f2701fd124b162345603762cb..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/DoubleSampleListItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleSampleList;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleSampleList} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DoubleSampleListItemProvider
-	extends SampleListItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DoubleSampleListItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.DOUBLE_SAMPLE_LIST__ITEMS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns DoubleSampleList.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DoubleSampleList"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_DoubleSampleList_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DoubleSampleList.class)) {
-			case FunctionsPackage.DOUBLE_SAMPLE_LIST__ITEMS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.DOUBLE_SAMPLE_LIST__ITEMS,
-				 FunctionsFactory.eINSTANCE.createDoubleSample()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EmpiricalFunctionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EmpiricalFunctionItemProvider.java
deleted file mode 100644
index 0eba62d8cc2b103f7881e1b630a8911ae444f028..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EmpiricalFunctionItemProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EmpiricalFunction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EmpiricalFunctionItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EmpiricalFunctionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_EmpiricalFunction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EnumSampleItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EnumSampleItemProvider.java
deleted file mode 100644
index c0109e34d5ce510d11b38315364ff7184172d410..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EnumSampleItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.EnumSample;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EnumSample} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EnumSampleItemProvider
-	extends SampleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnumSampleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-			addProbabilityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EnumSample_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EnumSample_value_feature", "_UI_EnumSample_type"),
-				 FunctionsPackage.Literals.ENUM_SAMPLE__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Probability feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProbabilityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EnumSample_probability_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EnumSample_probability_feature", "_UI_EnumSample_type"),
-				 FunctionsPackage.Literals.ENUM_SAMPLE__PROBABILITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns EnumSample.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EnumSample"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((EnumSample)object).getValue();
-		return label == null || label.length() == 0 ?
-			getString("_UI_EnumSample_type") :
-			getString("_UI_EnumSample_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(EnumSample.class)) {
-			case FunctionsPackage.ENUM_SAMPLE__VALUE:
-			case FunctionsPackage.ENUM_SAMPLE__PROBABILITY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EnumSampleListItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EnumSampleListItemProvider.java
deleted file mode 100644
index 53374d4a98d5351ce4a2b4ab5eed95631f6769eb..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/EnumSampleListItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.EnumSampleList;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EnumSampleList} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EnumSampleListItemProvider
-	extends SampleListItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnumSampleListItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.ENUM_SAMPLE_LIST__ITEMS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns EnumSampleList.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EnumSampleList"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_EnumSampleList_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(EnumSampleList.class)) {
-			case FunctionsPackage.ENUM_SAMPLE_LIST__ITEMS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.ENUM_SAMPLE_LIST__ITEMS,
-				 FunctionsFactory.eINSTANCE.createEnumSample()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExplicitFunctionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExplicitFunctionItemProvider.java
deleted file mode 100644
index f17332f51fce903871499d79c524f073309a4e59..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExplicitFunctionItemProvider.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitFunction;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitFunction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExplicitFunctionItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExplicitFunctionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSpecificationPropertyDescriptor(object);
-			addExpressionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Specification feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSpecificationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExplicitFunction_specification_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExplicitFunction_specification_feature", "_UI_ExplicitFunction_type"),
-				 FunctionsPackage.Literals.EXPLICIT_FUNCTION__SPECIFICATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Expression feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExplicitFunction_expression_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExplicitFunction_expression_feature", "_UI_ExplicitFunction_type"),
-				 FunctionsPackage.Literals.EXPLICIT_FUNCTION__EXPRESSION,
-				 false,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ExplicitFunction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExplicitFunction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ExplicitFunction)object).getSpecification();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ExplicitFunction_type") :
-			getString("_UI_ExplicitFunction_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ExplicitFunction.class)) {
-			case FunctionsPackage.EXPLICIT_FUNCTION__SPECIFICATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExponentialDistributionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExponentialDistributionItemProvider.java
deleted file mode 100644
index 8a4568f8b9247de40723c679e28288381c4c6878..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExponentialDistributionItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.ExponentialDistribution;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExponentialDistribution} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExponentialDistributionItemProvider
-	extends ContinuousPDFItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExponentialDistributionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRatePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Rate feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExponentialDistribution_rate_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExponentialDistribution_rate_feature", "_UI_ExponentialDistribution_type"),
-				 FunctionsPackage.Literals.EXPONENTIAL_DISTRIBUTION__RATE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ExponentialDistribution.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExponentialDistribution"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigDecimal labelValue = ((ExponentialDistribution)object).getRate();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ExponentialDistribution_type") :
-			getString("_UI_ExponentialDistribution_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ExponentialDistribution.class)) {
-			case FunctionsPackage.EXPONENTIAL_DISTRIBUTION__RATE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExpressionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExpressionItemProvider.java
deleted file mode 100644
index e8cca165ecd931d5dbe3d3142c5d354b5116f816..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ExpressionItemProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Expression} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExpressionItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Expression_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FormalParameterItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FormalParameterItemProvider.java
deleted file mode 100644
index ba97052f453b26aefd1372a304424cdafd591b3f..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FormalParameterItemProvider.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FormalParameter;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.FormalParameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FormalParameterItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FormalParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FormalParameter_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FormalParameter_value_feature", "_UI_FormalParameter_type"),
-				 FunctionsPackage.Literals.FORMAL_PARAMETER__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns FormalParameter.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FormalParameter"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((FormalParameter)object).getValue();
-		return label == null || label.length() == 0 ?
-			getString("_UI_FormalParameter_type") :
-			getString("_UI_FormalParameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FormalParameter.class)) {
-			case FunctionsPackage.FORMAL_PARAMETER__VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FunctionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FunctionItemProvider.java
deleted file mode 100644
index 24f4567fbfceb966a6e9c100dcf827fbe46fed77..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FunctionItemProvider.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.Function;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Function} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FunctionItemProvider
-	extends AtomItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FunctionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Function_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Function_name_feature", "_UI_Function_type"),
-				 FunctionsPackage.Literals.FUNCTION__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.FUNCTION__PARAMETERS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Function.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Function"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Function)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Function_type") :
-			getString("_UI_Function_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Function.class)) {
-			case FunctionsPackage.FUNCTION__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case FunctionsPackage.FUNCTION__PARAMETERS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.FUNCTION__PARAMETERS,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FunctionsItemProviderAdapterFactory.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FunctionsItemProviderAdapterFactory.java
deleted file mode 100644
index 2140b9b0794d5900a4b71e5a87868d758bcd7212..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/FunctionsItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,848 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.util.FunctionsAdapterFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FunctionsItemProviderAdapterFactory extends FunctionsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FunctionsItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitFunction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExplicitFunctionItemProvider explicitFunctionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExplicitFunction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExplicitFunctionAdapter() {
-		if (explicitFunctionItemProvider == null) {
-			explicitFunctionItemProvider = new ExplicitFunctionItemProvider(this);
-		}
-
-		return explicitFunctionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Function} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FunctionItemProvider functionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Function}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFunctionAdapter() {
-		if (functionItemProvider == null) {
-			functionItemProvider = new FunctionItemProvider(this);
-		}
-
-		return functionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.FormalParameter} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FormalParameterItemProvider formalParameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.FormalParameter}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFormalParameterAdapter() {
-		if (formalParameterItemProvider == null) {
-			formalParameterItemProvider = new FormalParameterItemProvider(this);
-		}
-
-		return formalParameterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BooleanLiteral} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BooleanLiteralItemProvider booleanLiteralItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BooleanLiteral}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBooleanLiteralAdapter() {
-		if (booleanLiteralItemProvider == null) {
-			booleanLiteralItemProvider = new BooleanLiteralItemProvider(this);
-		}
-
-		return booleanLiteralItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntLiteral} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IntLiteralItemProvider intLiteralItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntLiteral}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createIntLiteralAdapter() {
-		if (intLiteralItemProvider == null) {
-			intLiteralItemProvider = new IntLiteralItemProvider(this);
-		}
-
-		return intLiteralItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleLiteral} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DoubleLiteralItemProvider doubleLiteralItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleLiteral}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDoubleLiteralAdapter() {
-		if (doubleLiteralItemProvider == null) {
-			doubleLiteralItemProvider = new DoubleLiteralItemProvider(this);
-		}
-
-		return doubleLiteralItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IfElseExpression} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IfElseExpressionItemProvider ifElseExpressionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IfElseExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createIfElseExpressionAdapter() {
-		if (ifElseExpressionItemProvider == null) {
-			ifElseExpressionItemProvider = new IfElseExpressionItemProvider(this);
-		}
-
-		return ifElseExpressionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BinaryBooleanExpression} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BinaryBooleanExpressionItemProvider binaryBooleanExpressionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BinaryBooleanExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBinaryBooleanExpressionAdapter() {
-		if (binaryBooleanExpressionItemProvider == null) {
-			binaryBooleanExpressionItemProvider = new BinaryBooleanExpressionItemProvider(this);
-		}
-
-		return binaryBooleanExpressionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.UnaryBooleanExpression} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UnaryBooleanExpressionItemProvider unaryBooleanExpressionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.UnaryBooleanExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createUnaryBooleanExpressionAdapter() {
-		if (unaryBooleanExpressionItemProvider == null) {
-			unaryBooleanExpressionItemProvider = new UnaryBooleanExpressionItemProvider(this);
-		}
-
-		return unaryBooleanExpressionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Comparison} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComparisonItemProvider comparisonItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Comparison}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createComparisonAdapter() {
-		if (comparisonItemProvider == null) {
-			comparisonItemProvider = new ComparisonItemProvider(this);
-		}
-
-		return comparisonItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Term} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TermItemProvider termItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Term}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createTermAdapter() {
-		if (termItemProvider == null) {
-			termItemProvider = new TermItemProvider(this);
-		}
-
-		return termItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Product} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProductItemProvider productItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Product}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createProductAdapter() {
-		if (productItemProvider == null) {
-			productItemProvider = new ProductItemProvider(this);
-		}
-
-		return productItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Power} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PowerItemProvider powerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Power}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPowerAdapter() {
-		if (powerItemProvider == null) {
-			powerItemProvider = new PowerItemProvider(this);
-		}
-
-		return powerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EmpiricalFunction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EmpiricalFunctionItemProvider empiricalFunctionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EmpiricalFunction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createEmpiricalFunctionAdapter() {
-		if (empiricalFunctionItemProvider == null) {
-			empiricalFunctionItemProvider = new EmpiricalFunctionItemProvider(this);
-		}
-
-		return empiricalFunctionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RandomVariableItemProvider randomVariableItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRandomVariableAdapter() {
-		if (randomVariableItemProvider == null) {
-			randomVariableItemProvider = new RandomVariableItemProvider(this);
-		}
-
-		return randomVariableItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ProbabilityMassFunction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProbabilityMassFunctionItemProvider probabilityMassFunctionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ProbabilityMassFunction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createProbabilityMassFunctionAdapter() {
-		if (probabilityMassFunctionItemProvider == null) {
-			probabilityMassFunctionItemProvider = new ProbabilityMassFunctionItemProvider(this);
-		}
-
-		return probabilityMassFunctionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleSample} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DoubleSampleItemProvider doubleSampleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleSample}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDoubleSampleAdapter() {
-		if (doubleSampleItemProvider == null) {
-			doubleSampleItemProvider = new DoubleSampleItemProvider(this);
-		}
-
-		return doubleSampleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntSample} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IntSampleItemProvider intSampleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntSample}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createIntSampleAdapter() {
-		if (intSampleItemProvider == null) {
-			intSampleItemProvider = new IntSampleItemProvider(this);
-		}
-
-		return intSampleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoolSample} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BoolSampleItemProvider boolSampleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoolSample}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBoolSampleAdapter() {
-		if (boolSampleItemProvider == null) {
-			boolSampleItemProvider = new BoolSampleItemProvider(this);
-		}
-
-		return boolSampleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EnumSample} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EnumSampleItemProvider enumSampleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EnumSample}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createEnumSampleAdapter() {
-		if (enumSampleItemProvider == null) {
-			enumSampleItemProvider = new EnumSampleItemProvider(this);
-		}
-
-		return enumSampleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntSampleList} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IntSampleListItemProvider intSampleListItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntSampleList}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createIntSampleListAdapter() {
-		if (intSampleListItemProvider == null) {
-			intSampleListItemProvider = new IntSampleListItemProvider(this);
-		}
-
-		return intSampleListItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleSampleList} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DoubleSampleListItemProvider doubleSampleListItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.DoubleSampleList}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDoubleSampleListAdapter() {
-		if (doubleSampleListItemProvider == null) {
-			doubleSampleListItemProvider = new DoubleSampleListItemProvider(this);
-		}
-
-		return doubleSampleListItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoolSampleList} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BoolSampleListItemProvider boolSampleListItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoolSampleList}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBoolSampleListAdapter() {
-		if (boolSampleListItemProvider == null) {
-			boolSampleListItemProvider = new BoolSampleListItemProvider(this);
-		}
-
-		return boolSampleListItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EnumSampleList} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EnumSampleListItemProvider enumSampleListItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.EnumSampleList}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createEnumSampleListAdapter() {
-		if (enumSampleListItemProvider == null) {
-			enumSampleListItemProvider = new EnumSampleListItemProvider(this);
-		}
-
-		return enumSampleListItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoxedPDF} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BoxedPDFItemProvider boxedPDFItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.BoxedPDF}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBoxedPDFAdapter() {
-		if (boxedPDFItemProvider == null) {
-			boxedPDFItemProvider = new BoxedPDFItemProvider(this);
-		}
-
-		return boxedPDFItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ContinuousSample} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContinuousSampleItemProvider continuousSampleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ContinuousSample}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createContinuousSampleAdapter() {
-		if (continuousSampleItemProvider == null) {
-			continuousSampleItemProvider = new ContinuousSampleItemProvider(this);
-		}
-
-		return continuousSampleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.NormalDistribution} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NormalDistributionItemProvider normalDistributionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.NormalDistribution}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createNormalDistributionAdapter() {
-		if (normalDistributionItemProvider == null) {
-			normalDistributionItemProvider = new NormalDistributionItemProvider(this);
-		}
-
-		return normalDistributionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExponentialDistribution} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExponentialDistributionItemProvider exponentialDistributionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ExponentialDistribution}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExponentialDistributionAdapter() {
-		if (exponentialDistributionItemProvider == null) {
-			exponentialDistributionItemProvider = new ExponentialDistributionItemProvider(this);
-		}
-
-		return exponentialDistributionItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (explicitFunctionItemProvider != null) explicitFunctionItemProvider.dispose();
-		if (functionItemProvider != null) functionItemProvider.dispose();
-		if (formalParameterItemProvider != null) formalParameterItemProvider.dispose();
-		if (booleanLiteralItemProvider != null) booleanLiteralItemProvider.dispose();
-		if (intLiteralItemProvider != null) intLiteralItemProvider.dispose();
-		if (doubleLiteralItemProvider != null) doubleLiteralItemProvider.dispose();
-		if (ifElseExpressionItemProvider != null) ifElseExpressionItemProvider.dispose();
-		if (binaryBooleanExpressionItemProvider != null) binaryBooleanExpressionItemProvider.dispose();
-		if (unaryBooleanExpressionItemProvider != null) unaryBooleanExpressionItemProvider.dispose();
-		if (comparisonItemProvider != null) comparisonItemProvider.dispose();
-		if (termItemProvider != null) termItemProvider.dispose();
-		if (productItemProvider != null) productItemProvider.dispose();
-		if (powerItemProvider != null) powerItemProvider.dispose();
-		if (empiricalFunctionItemProvider != null) empiricalFunctionItemProvider.dispose();
-		if (randomVariableItemProvider != null) randomVariableItemProvider.dispose();
-		if (probabilityMassFunctionItemProvider != null) probabilityMassFunctionItemProvider.dispose();
-		if (doubleSampleItemProvider != null) doubleSampleItemProvider.dispose();
-		if (intSampleItemProvider != null) intSampleItemProvider.dispose();
-		if (boolSampleItemProvider != null) boolSampleItemProvider.dispose();
-		if (enumSampleItemProvider != null) enumSampleItemProvider.dispose();
-		if (intSampleListItemProvider != null) intSampleListItemProvider.dispose();
-		if (doubleSampleListItemProvider != null) doubleSampleListItemProvider.dispose();
-		if (boolSampleListItemProvider != null) boolSampleListItemProvider.dispose();
-		if (enumSampleListItemProvider != null) enumSampleListItemProvider.dispose();
-		if (boxedPDFItemProvider != null) boxedPDFItemProvider.dispose();
-		if (continuousSampleItemProvider != null) continuousSampleItemProvider.dispose();
-		if (normalDistributionItemProvider != null) normalDistributionItemProvider.dispose();
-		if (exponentialDistributionItemProvider != null) exponentialDistributionItemProvider.dispose();
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IfElseExpressionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IfElseExpressionItemProvider.java
deleted file mode 100644
index 2ea8fab7592be27a2842707d5d816ee7f9afcc91..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IfElseExpressionItemProvider.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.IfElseExpression;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IfElseExpression} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IfElseExpressionItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IfElseExpressionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION);
-			childrenFeatures.add(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP);
-			childrenFeatures.add(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns IfElseExpression.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IfElseExpression"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_IfElseExpression_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(IfElseExpression.class)) {
-			case FunctionsPackage.IF_ELSE_EXPRESSION__CONDITION:
-			case FunctionsPackage.IF_ELSE_EXPRESSION__TRUE_EXP:
-			case FunctionsPackage.IF_ELSE_EXPRESSION__FALSE_EXP:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == FunctionsPackage.Literals.IF_ELSE_EXPRESSION__CONDITION ||
-			childFeature == FunctionsPackage.Literals.IF_ELSE_EXPRESSION__TRUE_EXP ||
-			childFeature == FunctionsPackage.Literals.IF_ELSE_EXPRESSION__FALSE_EXP;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntLiteralItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntLiteralItemProvider.java
deleted file mode 100644
index 2ee752692c62bf3a1e15a2804eaeb14c123b8214..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntLiteralItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.IntLiteral;
-
-import java.math.BigInteger;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntLiteral} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IntLiteralItemProvider
-	extends LiteralItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IntLiteralItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IntLiteral_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_IntLiteral_value_feature", "_UI_IntLiteral_type"),
-				 FunctionsPackage.Literals.INT_LITERAL__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns IntLiteral.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntLiteral"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigInteger labelValue = ((IntLiteral)object).getValue();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_IntLiteral_type") :
-			getString("_UI_IntLiteral_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(IntLiteral.class)) {
-			case FunctionsPackage.INT_LITERAL__VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntSampleItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntSampleItemProvider.java
deleted file mode 100644
index 01602687dd956e7e8785cefe342b5fb4c47f9511..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntSampleItemProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.IntSample;
-
-import java.math.BigInteger;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntSample} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IntSampleItemProvider
-	extends SampleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IntSampleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-			addProbabilityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IntSample_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_IntSample_value_feature", "_UI_IntSample_type"),
-				 FunctionsPackage.Literals.INT_SAMPLE__VALUE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Probability feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProbabilityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_IntSample_probability_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_IntSample_probability_feature", "_UI_IntSample_type"),
-				 FunctionsPackage.Literals.INT_SAMPLE__PROBABILITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns IntSample.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntSample"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigInteger labelValue = ((IntSample)object).getValue();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_IntSample_type") :
-			getString("_UI_IntSample_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(IntSample.class)) {
-			case FunctionsPackage.INT_SAMPLE__VALUE:
-			case FunctionsPackage.INT_SAMPLE__PROBABILITY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntSampleListItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntSampleListItemProvider.java
deleted file mode 100644
index 15b54f41a2c449badb598848c7dac5d5c26d60c6..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/IntSampleListItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.IntSampleList;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.IntSampleList} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IntSampleListItemProvider
-	extends SampleListItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IntSampleListItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.INT_SAMPLE_LIST__ITEMS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns IntSampleList.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntSampleList"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_IntSampleList_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(IntSampleList.class)) {
-			case FunctionsPackage.INT_SAMPLE_LIST__ITEMS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.INT_SAMPLE_LIST__ITEMS,
-				 FunctionsFactory.eINSTANCE.createIntSample()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/LiteralItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/LiteralItemProvider.java
deleted file mode 100644
index ff70ec262e4b0a68afb31946c32f97725248b852..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/LiteralItemProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Literal} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LiteralItemProvider
-	extends AtomItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LiteralItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Literal.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Literal"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Literal_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/NormalDistributionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/NormalDistributionItemProvider.java
deleted file mode 100644
index d26bfc620a3e87b8c646d6ca0cfe5a5748aef9f0..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/NormalDistributionItemProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.NormalDistribution;
-
-import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.NormalDistribution} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class NormalDistributionItemProvider
-	extends ContinuousPDFItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NormalDistributionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addMuPropertyDescriptor(object);
-			addSigmaPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Mu feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMuPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NormalDistribution_mu_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NormalDistribution_mu_feature", "_UI_NormalDistribution_type"),
-				 FunctionsPackage.Literals.NORMAL_DISTRIBUTION__MU,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Sigma feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSigmaPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NormalDistribution_sigma_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NormalDistribution_sigma_feature", "_UI_NormalDistribution_type"),
-				 FunctionsPackage.Literals.NORMAL_DISTRIBUTION__SIGMA,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns NormalDistribution.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NormalDistribution"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigDecimal labelValue = ((NormalDistribution)object).getMu();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_NormalDistribution_type") :
-			getString("_UI_NormalDistribution_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(NormalDistribution.class)) {
-			case FunctionsPackage.NORMAL_DISTRIBUTION__MU:
-			case FunctionsPackage.NORMAL_DISTRIBUTION__SIGMA:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/PowerItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/PowerItemProvider.java
deleted file mode 100644
index d080a898003f68aa4234dc9c2db18ca40bba1094..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/PowerItemProvider.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.Power;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Power} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PowerItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PowerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.POWER__BASE);
-			childrenFeatures.add(FunctionsPackage.Literals.POWER__EXPONENT);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Power_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Power.class)) {
-			case FunctionsPackage.POWER__BASE:
-			case FunctionsPackage.POWER__EXPONENT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__BASE,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.POWER__EXPONENT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == FunctionsPackage.Literals.POWER__BASE ||
-			childFeature == FunctionsPackage.Literals.POWER__EXPONENT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityDensityFunctionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityDensityFunctionItemProvider.java
deleted file mode 100644
index e04785d3f9d3cd4a24a498ff0eba6db598247b1a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityDensityFunctionItemProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ProbabilityDensityFunction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProbabilityDensityFunctionItemProvider
-	extends ProbabilityFunctionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProbabilityDensityFunctionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns ProbabilityDensityFunction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ProbabilityDensityFunction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ProbabilityDensityFunction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityFunctionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityFunctionItemProvider.java
deleted file mode 100644
index 56b7a6cfc702e1187e70c08de9d129f909ffdfa1..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityFunctionItemProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ProbabilityFunction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProbabilityFunctionItemProvider
-	extends AtomItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProbabilityFunctionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ProbabilityFunction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityMassFunctionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityMassFunctionItemProvider.java
deleted file mode 100644
index bcc9ddbb4890e8843784300967fc619ef67df09d..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProbabilityMassFunctionItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.ProbabilityMassFunction;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.ProbabilityMassFunction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProbabilityMassFunctionItemProvider
-	extends ProbabilityFunctionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProbabilityMassFunctionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.PROBABILITY_MASS_FUNCTION__SAMPLES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ProbabilityMassFunction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ProbabilityMassFunction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ProbabilityMassFunction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ProbabilityMassFunction.class)) {
-			case FunctionsPackage.PROBABILITY_MASS_FUNCTION__SAMPLES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PROBABILITY_MASS_FUNCTION__SAMPLES,
-				 FunctionsFactory.eINSTANCE.createIntSampleList()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PROBABILITY_MASS_FUNCTION__SAMPLES,
-				 FunctionsFactory.eINSTANCE.createDoubleSampleList()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PROBABILITY_MASS_FUNCTION__SAMPLES,
-				 FunctionsFactory.eINSTANCE.createBoolSampleList()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PROBABILITY_MASS_FUNCTION__SAMPLES,
-				 FunctionsFactory.eINSTANCE.createEnumSampleList()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProductItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProductItemProvider.java
deleted file mode 100644
index ab3ba51eb96b9dda7a7884b738714ec1977b636b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/ProductItemProvider.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.Product;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.ProductOperation;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Product} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ProductItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ProductItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addOperationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Operation feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOperationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Product_operation_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Product_operation_feature", "_UI_Product_type"),
-				 FunctionsPackage.Literals.PRODUCT__OPERATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.PRODUCT__LEFT);
-			childrenFeatures.add(FunctionsPackage.Literals.PRODUCT__RIGHT);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		ProductOperation labelValue = ((Product)object).getOperation();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Product_type") :
-			getString("_UI_Product_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Product.class)) {
-			case FunctionsPackage.PRODUCT__OPERATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case FunctionsPackage.PRODUCT__LEFT:
-			case FunctionsPackage.PRODUCT__RIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__LEFT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.PRODUCT__RIGHT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == FunctionsPackage.Literals.PRODUCT__LEFT ||
-			childFeature == FunctionsPackage.Literals.PRODUCT__RIGHT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/RandomVariableItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/RandomVariableItemProvider.java
deleted file mode 100644
index d78095a4066486e1722a635c2bbd1934794d3936..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/RandomVariableItemProvider.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.RandomVariable} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RandomVariableItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RandomVariableItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSpecificationPropertyDescriptor(object);
-			addProbFunctionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Specification feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSpecificationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RandomVariable_specification_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RandomVariable_specification_feature", "_UI_RandomVariable_type"),
-				 FunctionsPackage.Literals.RANDOM_VARIABLE__SPECIFICATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Prob Function feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProbFunctionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RandomVariable_probFunction_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RandomVariable_probFunction_feature", "_UI_RandomVariable_type"),
-				 FunctionsPackage.Literals.RANDOM_VARIABLE__PROB_FUNCTION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns RandomVariable.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RandomVariable"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((RandomVariable)object).getSpecification();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RandomVariable_type") :
-			getString("_UI_RandomVariable_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(RandomVariable.class)) {
-			case FunctionsPackage.RANDOM_VARIABLE__SPECIFICATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/SampleItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/SampleItemProvider.java
deleted file mode 100644
index f6da79bf1b93ab0d462c6870faee385c82c76402..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/SampleItemProvider.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Sample} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SampleItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SampleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Sample.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Sample"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Sample_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/SampleListItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/SampleListItemProvider.java
deleted file mode 100644
index 221cecfdc837daa8ff36bdbe135198b1e9494b20..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/SampleListItemProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.SampleList} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SampleListItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SampleListItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_SampleList_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/TermItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/TermItemProvider.java
deleted file mode 100644
index cefc607c3c6e0b5a07814ae8b84028571ca84fca..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/TermItemProvider.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.Term;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.TermOperation;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.Term} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TermItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TermItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addOperationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Operation feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOperationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Term_operation_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Term_operation_feature", "_UI_Term_type"),
-				 FunctionsPackage.Literals.TERM__OPERATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.TERM__LEFT);
-			childrenFeatures.add(FunctionsPackage.Literals.TERM__RIGHT);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		TermOperation labelValue = ((Term)object).getOperation();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Term_type") :
-			getString("_UI_Term_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Term.class)) {
-			case FunctionsPackage.TERM__OPERATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case FunctionsPackage.TERM__LEFT:
-			case FunctionsPackage.TERM__RIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__LEFT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.TERM__RIGHT,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == FunctionsPackage.Literals.TERM__LEFT ||
-			childFeature == FunctionsPackage.Literals.TERM__RIGHT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/UnaryBooleanExpressionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/UnaryBooleanExpressionItemProvider.java
deleted file mode 100644
index 35125743c02a4ab66f5520310784b965a75fa212..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/functions/provider/UnaryBooleanExpressionItemProvider.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.functions.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.FunctionsPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.functions.UnaryBooleanExpression;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.functions.UnaryBooleanExpression} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class UnaryBooleanExpressionItemProvider
-	extends ExpressionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UnaryBooleanExpressionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns UnaryBooleanExpression.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/UnaryBooleanExpression"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_UnaryBooleanExpression_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(UnaryBooleanExpression.class)) {
-			case FunctionsPackage.UNARY_BOOLEAN_EXPRESSION__INNER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createFormalParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createBooleanLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createIntLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createDoubleLiteral()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createIfElseExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createBinaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createUnaryBooleanExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createComparison()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createTerm()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createProduct()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createPower()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createProbabilityMassFunction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createBoxedPDF()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createNormalDistribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(FunctionsPackage.Literals.UNARY_BOOLEAN_EXPRESSION__INNER,
-				 FunctionsFactory.eINSTANCE.createExponentialDistribution()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/CallParameterItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/CallParameterItemProvider.java
deleted file mode 100644
index 65a8345bb515b473f48a146825659f2365b7923b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/CallParameterItemProvider.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.CallParameter;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.CallParameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CallParameterItemProvider
-	extends InfluencingParameterItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CallParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCharacterizationPropertyDescriptor(object);
-			addSignaturePropertyDescriptor(object);
-			addParameterPropertyDescriptor(object);
-			addReturnTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Characterization feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCharacterizationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CallParameter_characterization_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CallParameter_characterization_feature", "_UI_CallParameter_type"),
-				 ParameterdependenciesPackage.Literals.CALL_PARAMETER__CHARACTERIZATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Signature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSignaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CallParameter_signature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CallParameter_signature_feature", "_UI_CallParameter_type"),
-				 ParameterdependenciesPackage.Literals.CALL_PARAMETER__SIGNATURE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Parameter feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addParameterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CallParameter_parameter_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CallParameter_parameter_feature", "_UI_CallParameter_type"),
-				 ParameterdependenciesPackage.Literals.CALL_PARAMETER__PARAMETER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Return Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReturnTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CallParameter_returnType_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CallParameter_returnType_feature", "_UI_CallParameter_type"),
-				 ParameterdependenciesPackage.Literals.CALL_PARAMETER__RETURN_TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CallParameter)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CallParameter_type") :
-			getString("_UI_CallParameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CallParameter.class)) {
-			case ParameterdependenciesPackage.CALL_PARAMETER__CHARACTERIZATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ComponentInstanceReferenceItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ComponentInstanceReferenceItemProvider.java
deleted file mode 100644
index 4f2e025ce409a7fde30eb1dab1461ed224b3168c..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ComponentInstanceReferenceItemProvider.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ComponentInstanceReference} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ComponentInstanceReferenceItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComponentInstanceReferenceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAssembliesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Assemblies feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAssembliesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ComponentInstanceReference_assemblies_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ComponentInstanceReference_assemblies_feature", "_UI_ComponentInstanceReference_type"),
-				 ParameterdependenciesPackage.Literals.COMPONENT_INSTANCE_REFERENCE__ASSEMBLIES,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ComponentInstanceReference.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ComponentInstanceReference"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ComponentInstanceReference_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/CorrelationRelationshipItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/CorrelationRelationshipItemProvider.java
deleted file mode 100644
index f8c86275eec00af6af6bb744f28248834cafe318..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/CorrelationRelationshipItemProvider.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.CorrelationRelationship;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.CorrelationRelationship} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CorrelationRelationshipItemProvider
-	extends RelationshipItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CorrelationRelationshipItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLeftInfluencingParameterPropertyDescriptor(object);
-			addRightInfluencingParameterPropertyDescriptor(object);
-			addLeftToRightEmpiricalCharacterizationPropertyDescriptor(object);
-			addRightToLeftEmpiricalCharacterizationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Left Influencing Parameter feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLeftInfluencingParameterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CorrelationRelationship_leftInfluencingParameter_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CorrelationRelationship_leftInfluencingParameter_feature", "_UI_CorrelationRelationship_type"),
-				 ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__LEFT_INFLUENCING_PARAMETER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Right Influencing Parameter feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRightInfluencingParameterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CorrelationRelationship_rightInfluencingParameter_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CorrelationRelationship_rightInfluencingParameter_feature", "_UI_CorrelationRelationship_type"),
-				 ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__RIGHT_INFLUENCING_PARAMETER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Left To Right Empirical Characterization feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLeftToRightEmpiricalCharacterizationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CorrelationRelationship_leftToRightEmpiricalCharacterization_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CorrelationRelationship_leftToRightEmpiricalCharacterization_feature", "_UI_CorrelationRelationship_type"),
-				 ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__LEFT_TO_RIGHT_EMPIRICAL_CHARACTERIZATION,
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Right To Left Empirical Characterization feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRightToLeftEmpiricalCharacterizationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CorrelationRelationship_rightToLeftEmpiricalCharacterization_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CorrelationRelationship_rightToLeftEmpiricalCharacterization_feature", "_UI_CorrelationRelationship_type"),
-				 ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__RIGHT_TO_LEFT_EMPIRICAL_CHARACTERIZATION,
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__LEFT_COMPONENT_INSTANCE_REFERENCE);
-			childrenFeatures.add(ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__RIGHT_COMPONENT_INSTANCE_REFERENCE);
-			childrenFeatures.add(ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__LEFT_TO_RIGHT_EXPLICIT_CHARACTERIZATION);
-			childrenFeatures.add(ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__RIGHT_TO_LEFT_EXPLICIT_CHARACTERIZATION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CorrelationRelationship.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CorrelationRelationship"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_CorrelationRelationship_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CorrelationRelationship.class)) {
-			case ParameterdependenciesPackage.CORRELATION_RELATIONSHIP__LEFT_TO_RIGHT_EMPIRICAL_CHARACTERIZATION:
-			case ParameterdependenciesPackage.CORRELATION_RELATIONSHIP__RIGHT_TO_LEFT_EMPIRICAL_CHARACTERIZATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ParameterdependenciesPackage.CORRELATION_RELATIONSHIP__LEFT_COMPONENT_INSTANCE_REFERENCE:
-			case ParameterdependenciesPackage.CORRELATION_RELATIONSHIP__RIGHT_COMPONENT_INSTANCE_REFERENCE:
-			case ParameterdependenciesPackage.CORRELATION_RELATIONSHIP__LEFT_TO_RIGHT_EXPLICIT_CHARACTERIZATION:
-			case ParameterdependenciesPackage.CORRELATION_RELATIONSHIP__RIGHT_TO_LEFT_EXPLICIT_CHARACTERIZATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__LEFT_COMPONENT_INSTANCE_REFERENCE,
-				 ParameterdependenciesFactory.eINSTANCE.createComponentInstanceReference()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__RIGHT_COMPONENT_INSTANCE_REFERENCE,
-				 ParameterdependenciesFactory.eINSTANCE.createComponentInstanceReference()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__LEFT_TO_RIGHT_EXPLICIT_CHARACTERIZATION,
-				 ParameterdependenciesFactory.eINSTANCE.createExplicitCharacterization()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__RIGHT_TO_LEFT_EXPLICIT_CHARACTERIZATION,
-				 ParameterdependenciesFactory.eINSTANCE.createExplicitCharacterization()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__LEFT_COMPONENT_INSTANCE_REFERENCE ||
-			childFeature == ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__RIGHT_COMPONENT_INSTANCE_REFERENCE ||
-			childFeature == ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__LEFT_TO_RIGHT_EXPLICIT_CHARACTERIZATION ||
-			childFeature == ParameterdependenciesPackage.Literals.CORRELATION_RELATIONSHIP__RIGHT_TO_LEFT_EXPLICIT_CHARACTERIZATION;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/DependencyRelationshipItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/DependencyRelationshipItemProvider.java
deleted file mode 100644
index df2ec7785da8e4fd05b796d0257737aa4a3d2691..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/DependencyRelationshipItemProvider.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.DependencyRelationship;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.DependencyRelationship} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DependencyRelationshipItemProvider
-	extends RelationshipItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DependencyRelationshipItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addInfluencedVariablePropertyDescriptor(object);
-			addInfluencingParameterPropertyDescriptor(object);
-			addEmpiricalCharacterizationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Influenced Variable feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addInfluencedVariablePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DependencyRelationship_influencedVariable_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DependencyRelationship_influencedVariable_feature", "_UI_DependencyRelationship_type"),
-				 ParameterdependenciesPackage.Literals.DEPENDENCY_RELATIONSHIP__INFLUENCED_VARIABLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Influencing Parameter feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addInfluencingParameterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DependencyRelationship_influencingParameter_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DependencyRelationship_influencingParameter_feature", "_UI_DependencyRelationship_type"),
-				 ParameterdependenciesPackage.Literals.DEPENDENCY_RELATIONSHIP__INFLUENCING_PARAMETER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Empirical Characterization feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEmpiricalCharacterizationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DependencyRelationship_empiricalCharacterization_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DependencyRelationship_empiricalCharacterization_feature", "_UI_DependencyRelationship_type"),
-				 ParameterdependenciesPackage.Literals.DEPENDENCY_RELATIONSHIP__EMPIRICAL_CHARACTERIZATION,
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ParameterdependenciesPackage.Literals.DEPENDENCY_RELATIONSHIP__EXPLICIT_CHARACTERIZATION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns DependencyRelationship.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DependencyRelationship"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_DependencyRelationship_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DependencyRelationship.class)) {
-			case ParameterdependenciesPackage.DEPENDENCY_RELATIONSHIP__EMPIRICAL_CHARACTERIZATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ParameterdependenciesPackage.DEPENDENCY_RELATIONSHIP__EXPLICIT_CHARACTERIZATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ParameterdependenciesPackage.Literals.DEPENDENCY_RELATIONSHIP__EXPLICIT_CHARACTERIZATION,
-				 ParameterdependenciesFactory.eINSTANCE.createExplicitCharacterization()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ExternalCallParameterItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ExternalCallParameterItemProvider.java
deleted file mode 100644
index f13a3224a66e5abe0df0588591265b1d7cb1203c..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ExternalCallParameterItemProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExternalCallParameter;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExternalCallParameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExternalCallParameterItemProvider
-	extends CallParameterItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExternalCallParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addExternallCallPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Externall Call feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExternallCallPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExternalCallParameter_externallCall_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExternalCallParameter_externallCall_feature", "_UI_ExternalCallParameter_type"),
-				 ParameterdependenciesPackage.Literals.EXTERNAL_CALL_PARAMETER__EXTERNALL_CALL,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ExternalCallParameter.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalCallParameter"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ExternalCallParameter)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ExternalCallParameter_type") :
-			getString("_UI_ExternalCallParameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ExternalCallReturnParameterItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ExternalCallReturnParameterItemProvider.java
deleted file mode 100644
index fa4df0c8bd1d66c02b3152f1cfe291289a746891..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ExternalCallReturnParameterItemProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExternalCallReturnParameter;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExternalCallReturnParameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExternalCallReturnParameterItemProvider
-	extends CallParameterItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExternalCallReturnParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addExternalCallPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the External Call feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExternalCallPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExternalCallReturnParameter_externalCall_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExternalCallReturnParameter_externalCall_feature", "_UI_ExternalCallReturnParameter_type"),
-				 ParameterdependenciesPackage.Literals.EXTERNAL_CALL_RETURN_PARAMETER__EXTERNAL_CALL,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ExternalCallReturnParameter.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalCallReturnParameter"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ExternalCallReturnParameter)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ExternalCallReturnParameter_type") :
-			getString("_UI_ExternalCallReturnParameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/InfluencingParameterItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/InfluencingParameterItemProvider.java
deleted file mode 100644
index 8d60cdbfab23717b8cd55510cb9d666147ab5f5d..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/InfluencingParameterItemProvider.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.InfluencingParameter;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.InfluencingParameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InfluencingParameterItemProvider
-	extends ModelVariableItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InfluencingParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addBehaviorPropertyDescriptor(object);
-			addNamePropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Behavior feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBehaviorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InfluencingParameter_behavior_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InfluencingParameter_behavior_feature", "_UI_InfluencingParameter_type"),
-				 ParameterdependenciesPackage.Literals.INFLUENCING_PARAMETER__BEHAVIOR,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InfluencingParameter_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InfluencingParameter_name_feature", "_UI_InfluencingParameter_type"),
-				 ParameterdependenciesPackage.Literals.INFLUENCING_PARAMETER__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InfluencingParameter_description_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InfluencingParameter_description_feature", "_UI_InfluencingParameter_type"),
-				 ParameterdependenciesPackage.Literals.INFLUENCING_PARAMETER__DESCRIPTION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ParameterdependenciesPackage.Literals.INFLUENCING_PARAMETER__SCOPE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns InfluencingParameter.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InfluencingParameter"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((InfluencingParameter)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InfluencingParameter_type") :
-			getString("_UI_InfluencingParameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(InfluencingParameter.class)) {
-			case ParameterdependenciesPackage.INFLUENCING_PARAMETER__NAME:
-			case ParameterdependenciesPackage.INFLUENCING_PARAMETER__DESCRIPTION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ParameterdependenciesPackage.INFLUENCING_PARAMETER__SCOPE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ParameterdependenciesPackage.Literals.INFLUENCING_PARAMETER__SCOPE,
-				 ParameterdependenciesFactory.eINSTANCE.createScope()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ModelVariableItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ModelVariableItemProvider.java
deleted file mode 100644
index 38a3f24fda9cd8063bbdea451257d0281cc63916..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ModelVariableItemProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ModelVariable} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelVariableItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelVariableItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ModelVariable_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ParameterdependenciesItemProviderAdapterFactory.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ParameterdependenciesItemProviderAdapterFactory.java
deleted file mode 100644
index 8c5fccde588e2413fc6735aca32b9e2ba27faa7a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ParameterdependenciesItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.util.ParameterdependenciesAdapterFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ParameterdependenciesItemProviderAdapterFactory extends ParameterdependenciesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParameterdependenciesItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.InfluencedVariable} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InfluencedVariableItemProvider influencedVariableItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.InfluencedVariable}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createInfluencedVariableAdapter() {
-		if (influencedVariableItemProvider == null) {
-			influencedVariableItemProvider = new InfluencedVariableItemProvider(this);
-		}
-
-		return influencedVariableItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.InfluencingParameter} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InfluencingParameterItemProvider influencingParameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.InfluencingParameter}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createInfluencingParameterAdapter() {
-		if (influencingParameterItemProvider == null) {
-			influencingParameterItemProvider = new InfluencingParameterItemProvider(this);
-		}
-
-		return influencingParameterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.DependencyRelationship} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DependencyRelationshipItemProvider dependencyRelationshipItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.DependencyRelationship}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDependencyRelationshipAdapter() {
-		if (dependencyRelationshipItemProvider == null) {
-			dependencyRelationshipItemProvider = new DependencyRelationshipItemProvider(this);
-		}
-
-		return dependencyRelationshipItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.CorrelationRelationship} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CorrelationRelationshipItemProvider correlationRelationshipItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.CorrelationRelationship}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCorrelationRelationshipAdapter() {
-		if (correlationRelationshipItemProvider == null) {
-			correlationRelationshipItemProvider = new CorrelationRelationshipItemProvider(this);
-		}
-
-		return correlationRelationshipItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ComponentInstanceReference} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComponentInstanceReferenceItemProvider componentInstanceReferenceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ComponentInstanceReference}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createComponentInstanceReferenceAdapter() {
-		if (componentInstanceReferenceItemProvider == null) {
-			componentInstanceReferenceItemProvider = new ComponentInstanceReferenceItemProvider(this);
-		}
-
-		return componentInstanceReferenceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.Scope} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ScopeItemProvider scopeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.Scope}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createScopeAdapter() {
-		if (scopeItemProvider == null) {
-			scopeItemProvider = new ScopeItemProvider(this);
-		}
-
-		return scopeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExplicitCharacterization} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExplicitCharacterizationItemProvider explicitCharacterizationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExplicitCharacterization}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExplicitCharacterizationAdapter() {
-		if (explicitCharacterizationItemProvider == null) {
-			explicitCharacterizationItemProvider = new ExplicitCharacterizationItemProvider(this);
-		}
-
-		return explicitCharacterizationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.EmpiricalCharacterization} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EmpiricalCharacterizationItemProvider empiricalCharacterizationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.EmpiricalCharacterization}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createEmpiricalCharacterizationAdapter() {
-		if (empiricalCharacterizationItemProvider == null) {
-			empiricalCharacterizationItemProvider = new EmpiricalCharacterizationItemProvider(this);
-		}
-
-		return empiricalCharacterizationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ServiceInputParameter} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServiceInputParameterItemProvider serviceInputParameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ServiceInputParameter}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createServiceInputParameterAdapter() {
-		if (serviceInputParameterItemProvider == null) {
-			serviceInputParameterItemProvider = new ServiceInputParameterItemProvider(this);
-		}
-
-		return serviceInputParameterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExternalCallReturnParameter} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExternalCallReturnParameterItemProvider externalCallReturnParameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExternalCallReturnParameter}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExternalCallReturnParameterAdapter() {
-		if (externalCallReturnParameterItemProvider == null) {
-			externalCallReturnParameterItemProvider = new ExternalCallReturnParameterItemProvider(this);
-		}
-
-		return externalCallReturnParameterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExternalCallParameter} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExternalCallParameterItemProvider externalCallParameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ExternalCallParameter}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExternalCallParameterAdapter() {
-		if (externalCallParameterItemProvider == null) {
-			externalCallParameterItemProvider = new ExternalCallParameterItemProvider(this);
-		}
-
-		return externalCallParameterItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (influencedVariableItemProvider != null) influencedVariableItemProvider.dispose();
-		if (influencingParameterItemProvider != null) influencingParameterItemProvider.dispose();
-		if (dependencyRelationshipItemProvider != null) dependencyRelationshipItemProvider.dispose();
-		if (correlationRelationshipItemProvider != null) correlationRelationshipItemProvider.dispose();
-		if (componentInstanceReferenceItemProvider != null) componentInstanceReferenceItemProvider.dispose();
-		if (scopeItemProvider != null) scopeItemProvider.dispose();
-		if (explicitCharacterizationItemProvider != null) explicitCharacterizationItemProvider.dispose();
-		if (empiricalCharacterizationItemProvider != null) empiricalCharacterizationItemProvider.dispose();
-		if (serviceInputParameterItemProvider != null) serviceInputParameterItemProvider.dispose();
-		if (externalCallReturnParameterItemProvider != null) externalCallReturnParameterItemProvider.dispose();
-		if (externalCallParameterItemProvider != null) externalCallParameterItemProvider.dispose();
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/RelationshipItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/RelationshipItemProvider.java
deleted file mode 100644
index 2567ac0d543cdce81158e1adb0ff411d238365ed..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/RelationshipItemProvider.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.Relationship} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RelationshipItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RelationshipItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSurroundingEntityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Surrounding Entity feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSurroundingEntityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Relationship_surroundingEntity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Relationship_surroundingEntity_feature", "_UI_Relationship_type"),
-				 ParameterdependenciesPackage.Literals.RELATIONSHIP__SURROUNDING_ENTITY,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Relationship_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ServiceInputParameterItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ServiceInputParameterItemProvider.java
deleted file mode 100644
index 33a71a5c14d476d0f29863d3f8a8f017e82a051f..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/parameterdependencies/provider/ServiceInputParameterItemProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ServiceInputParameter;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ServiceInputParameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ServiceInputParameterItemProvider
-	extends CallParameterItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceInputParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addProvidedRolePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Provided Role feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProvidedRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ServiceInputParameter_providedRole_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceInputParameter_providedRole_feature", "_UI_ServiceInputParameter_type"),
-				 ParameterdependenciesPackage.Literals.SERVICE_INPUT_PARAMETER__PROVIDED_ROLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ServiceInputParameter.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ServiceInputParameter"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ServiceInputParameter)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ServiceInputParameter_type") :
-			getString("_UI_ServiceInputParameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/provider/ApplicationlevelEditPlugin.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/provider/ApplicationlevelEditPlugin.java
deleted file mode 100644
index 5613ed1190ce7d53729c06e9e086264f1349ba83..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/provider/ApplicationlevelEditPlugin.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.provider;
-
-import edu.kit.ipd.descartes.core.provider.CoreEditPlugin;
-
-import edu.kit.ipd.descartes.identifier.provider.IdentifierEditPlugin;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Applicationlevel edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class ApplicationlevelEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final ApplicationlevelEditPlugin INSTANCE = new ApplicationlevelEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ApplicationlevelEditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		     CoreEditPlugin.INSTANCE,
-		     IdentifierEditPlugin.INSTANCE,
-		   });
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/AssemblyConnectorItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/AssemblyConnectorItemProvider.java
deleted file mode 100644
index ea81508179a478e6a9ae1c755cf1c540db1bbf3f..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/AssemblyConnectorItemProvider.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.ConnectorItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyConnector;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyConnector} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AssemblyConnectorItemProvider
-	extends ConnectorItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AssemblyConnectorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRequiredRolePropertyDescriptor(object);
-			addProvidedRolePropertyDescriptor(object);
-			addProvidingAssemblyContextPropertyDescriptor(object);
-			addRequiringAssemblyContextPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Required Role feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRequiredRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AssemblyConnector_requiredRole_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AssemblyConnector_requiredRole_feature", "_UI_AssemblyConnector_type"),
-				 RepositoryPackage.Literals.ASSEMBLY_CONNECTOR__REQUIRED_ROLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Provided Role feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProvidedRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AssemblyConnector_providedRole_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AssemblyConnector_providedRole_feature", "_UI_AssemblyConnector_type"),
-				 RepositoryPackage.Literals.ASSEMBLY_CONNECTOR__PROVIDED_ROLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Providing Assembly Context feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProvidingAssemblyContextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AssemblyConnector_providingAssemblyContext_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AssemblyConnector_providingAssemblyContext_feature", "_UI_AssemblyConnector_type"),
-				 RepositoryPackage.Literals.ASSEMBLY_CONNECTOR__PROVIDING_ASSEMBLY_CONTEXT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Requiring Assembly Context feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRequiringAssemblyContextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AssemblyConnector_requiringAssemblyContext_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AssemblyConnector_requiringAssemblyContext_feature", "_UI_AssemblyConnector_type"),
-				 RepositoryPackage.Literals.ASSEMBLY_CONNECTOR__REQUIRING_ASSEMBLY_CONTEXT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns AssemblyConnector.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AssemblyConnector"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AssemblyConnector)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AssemblyConnector_type") :
-			getString("_UI_AssemblyConnector_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/AssemblyContextItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/AssemblyContextItemProvider.java
deleted file mode 100644
index 2647230fdee7a3ee51a79024282d11355a36f7b4..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/AssemblyContextItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyContext;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyContext} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AssemblyContextItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AssemblyContextItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addEncapsulatedComponentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Encapsulated Component feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEncapsulatedComponentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AssemblyContext_encapsulatedComponent_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AssemblyContext_encapsulatedComponent_feature", "_UI_AssemblyContext_type"),
-				 RepositoryPackage.Literals.ASSEMBLY_CONTEXT__ENCAPSULATED_COMPONENT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns AssemblyContext.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AssemblyContext"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AssemblyContext)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AssemblyContext_type") :
-			getString("_UI_AssemblyContext_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/BasicComponentItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/BasicComponentItemProvider.java
deleted file mode 100644
index bb6a388717586687f50d0aa73871bf640de8d43e..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/BasicComponentItemProvider.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.BasicComponent;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.BasicComponent} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BasicComponentItemProvider
-	extends RepositoryComponentItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BasicComponentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.BASIC_COMPONENT__SEMAPHORES);
-			childrenFeatures.add(RepositoryPackage.Literals.BASIC_COMPONENT__FINE_GRAINED_BEHAVIOR);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns BasicComponent.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicComponent"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((BasicComponent)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_BasicComponent_type") :
-			getString("_UI_BasicComponent_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BasicComponent.class)) {
-			case RepositoryPackage.BASIC_COMPONENT__SEMAPHORES:
-			case RepositoryPackage.BASIC_COMPONENT__FINE_GRAINED_BEHAVIOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.BASIC_COMPONENT__SEMAPHORES,
-				 RepositoryFactory.eINSTANCE.createSemaphore()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.BASIC_COMPONENT__FINE_GRAINED_BEHAVIOR,
-				 ServicebehaviorFactory.eINSTANCE.createFineGrainedBehavior()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CollectionDataTypeItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CollectionDataTypeItemProvider.java
deleted file mode 100644
index 27ca49af14b65f715f628eaac4f06fb202dcfb51..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CollectionDataTypeItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.CollectionDataType;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CollectionDataType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CollectionDataTypeItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CollectionDataTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addInnerTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Inner Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addInnerTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CollectionDataType_innerType_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CollectionDataType_innerType_feature", "_UI_CollectionDataType_type"),
-				 RepositoryPackage.Literals.COLLECTION_DATA_TYPE__INNER_TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns CollectionDataType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CollectionDataType"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CollectionDataType)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CollectionDataType_type") :
-			getString("_UI_CollectionDataType_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ComposedProvidingRequiringEntityItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ComposedProvidingRequiringEntityItemProvider.java
deleted file mode 100644
index c2a9437e1404ad925aff515fa99fa6697ee59f8b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ComposedProvidingRequiringEntityItemProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.ComposedProvidingRequiringEntity;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.ComposedProvidingRequiringEntity} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ComposedProvidingRequiringEntityItemProvider
-	extends ComposedStructureItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposedProvidingRequiringEntityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRelationshipPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Relationship feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRelationshipPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InterfaceProvidingRequiringEntity_relationship_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InterfaceProvidingRequiringEntity_relationship_feature", "_UI_InterfaceProvidingRequiringEntity_type"),
-				 RepositoryPackage.Literals.INTERFACE_PROVIDING_REQUIRING_ENTITY__RELATIONSHIP,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__PROVIDED_ROLES);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__BLACK_BOX_BEHAVIOR);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_REQUIRING_ENTITY__REQUIRED_ROLES);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_PROVIDING_REQUIRING_ENTITY__COARSE_GRAINED_BEHAVIOR);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ComposedProvidingRequiringEntity)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ComposedProvidingRequiringEntity_type") :
-			getString("_UI_ComposedProvidingRequiringEntity_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ComposedProvidingRequiringEntity.class)) {
-			case RepositoryPackage.COMPOSED_PROVIDING_REQUIRING_ENTITY__PROVIDED_ROLES:
-			case RepositoryPackage.COMPOSED_PROVIDING_REQUIRING_ENTITY__BLACK_BOX_BEHAVIOR:
-			case RepositoryPackage.COMPOSED_PROVIDING_REQUIRING_ENTITY__REQUIRED_ROLES:
-			case RepositoryPackage.COMPOSED_PROVIDING_REQUIRING_ENTITY__COARSE_GRAINED_BEHAVIOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__PROVIDED_ROLES,
-				 RepositoryFactory.eINSTANCE.createProvidedRole()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__BLACK_BOX_BEHAVIOR,
-				 ServicebehaviorFactory.eINSTANCE.createBlackBoxBehavior()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_REQUIRING_ENTITY__REQUIRED_ROLES,
-				 RepositoryFactory.eINSTANCE.createRequiredRole()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_PROVIDING_REQUIRING_ENTITY__COARSE_GRAINED_BEHAVIOR,
-				 ServicebehaviorFactory.eINSTANCE.createCoarseGrainedBehavior()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ComposedStructureItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ComposedStructureItemProvider.java
deleted file mode 100644
index 2dce45ff13e977019ed5018e1cadc198d0d69cf2..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ComposedStructureItemProvider.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.ComposedStructure;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.ComposedStructure} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ComposedStructureItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposedStructureItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONTEXTS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONNECTORS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__PROVIDED_DELEGATION_CONNECTORS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__REQUIRED_DELEGATION_CONNECTORS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ComposedStructure)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ComposedStructure_type") :
-			getString("_UI_ComposedStructure_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ComposedStructure.class)) {
-			case RepositoryPackage.COMPOSED_STRUCTURE__ASSEMBLY_CONTEXTS:
-			case RepositoryPackage.COMPOSED_STRUCTURE__ASSEMBLY_CONNECTORS:
-			case RepositoryPackage.COMPOSED_STRUCTURE__PROVIDED_DELEGATION_CONNECTORS:
-			case RepositoryPackage.COMPOSED_STRUCTURE__REQUIRED_DELEGATION_CONNECTORS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONTEXTS,
-				 RepositoryFactory.eINSTANCE.createAssemblyContext()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createAssemblyConnector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__PROVIDED_DELEGATION_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createProvidedDelegationConnector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__REQUIRED_DELEGATION_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createRequiredDelegationConnector()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CompositeComponentItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CompositeComponentItemProvider.java
deleted file mode 100644
index 9d797a4b615aac734457cc2e40ae14fc7342146a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CompositeComponentItemProvider.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeComponent;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeComponent} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompositeComponentItemProvider
-	extends RepositoryComponentItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompositeComponentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONTEXTS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONNECTORS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__PROVIDED_DELEGATION_CONNECTORS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__REQUIRED_DELEGATION_CONNECTORS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CompositeComponent.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeComponent"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CompositeComponent)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CompositeComponent_type") :
-			getString("_UI_CompositeComponent_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CompositeComponent.class)) {
-			case RepositoryPackage.COMPOSITE_COMPONENT__ASSEMBLY_CONTEXTS:
-			case RepositoryPackage.COMPOSITE_COMPONENT__ASSEMBLY_CONNECTORS:
-			case RepositoryPackage.COMPOSITE_COMPONENT__PROVIDED_DELEGATION_CONNECTORS:
-			case RepositoryPackage.COMPOSITE_COMPONENT__REQUIRED_DELEGATION_CONNECTORS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONTEXTS,
-				 RepositoryFactory.eINSTANCE.createAssemblyContext()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createAssemblyConnector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__PROVIDED_DELEGATION_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createProvidedDelegationConnector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__REQUIRED_DELEGATION_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createRequiredDelegationConnector()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CompositeDataTypeItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CompositeDataTypeItemProvider.java
deleted file mode 100644
index 142292c9e3de595760a501ddceef857db17717dc..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/CompositeDataTypeItemProvider.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeDataType;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeDataType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompositeDataTypeItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompositeDataTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addParentTypesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Parent Types feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addParentTypesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CompositeDataType_parentTypes_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CompositeDataType_parentTypes_feature", "_UI_CompositeDataType_type"),
-				 RepositoryPackage.Literals.COMPOSITE_DATA_TYPE__PARENT_TYPES,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSITE_DATA_TYPE__INNER_DECLARATIONS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CompositeDataType.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompositeDataType"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CompositeDataType)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CompositeDataType_type") :
-			getString("_UI_CompositeDataType_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CompositeDataType.class)) {
-			case RepositoryPackage.COMPOSITE_DATA_TYPE__INNER_DECLARATIONS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSITE_DATA_TYPE__INNER_DECLARATIONS,
-				 RepositoryFactory.eINSTANCE.createInnerDeclaration()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/DataTypeItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/DataTypeItemProvider.java
deleted file mode 100644
index f1d0f58880959df72ad19a3433f0dba6283e23b8..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/DataTypeItemProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.DataType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DataTypeItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DataTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_DataType_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/DelegationConnectorItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/DelegationConnectorItemProvider.java
deleted file mode 100644
index df4b62bcba5c3c925b5f2238f3b4c4b4c298bd5a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/DelegationConnectorItemProvider.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.ConnectorItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.DelegationConnector;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.DelegationConnector} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DelegationConnectorItemProvider
-	extends ConnectorItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DelegationConnectorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAssemblyContextPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Assembly Context feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAssemblyContextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DelegationConnector_assemblyContext_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DelegationConnector_assemblyContext_feature", "_UI_DelegationConnector_type"),
-				 RepositoryPackage.Literals.DELEGATION_CONNECTOR__ASSEMBLY_CONTEXT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((DelegationConnector)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DelegationConnector_type") :
-			getString("_UI_DelegationConnector_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ImportItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ImportItemProvider.java
deleted file mode 100644
index 78e27d59148596f670863cbbaba8288ef4f7f3d0..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ImportItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Import;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Import} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ImportItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImportItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addImportURIPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Import URI feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addImportURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Import_importURI_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Import_importURI_feature", "_UI_Import_type"),
-				 RepositoryPackage.Literals.IMPORT__IMPORT_URI,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Import.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Import"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Import)object).getImportURI();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Import_type") :
-			getString("_UI_Import_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Import.class)) {
-			case RepositoryPackage.IMPORT__IMPORT_URI:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InnerDeclarationItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InnerDeclarationItemProvider.java
deleted file mode 100644
index 4d303490cdcb5979854751bdce1641060f9fd61c..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InnerDeclarationItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.InnerDeclaration;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.InnerDeclaration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InnerDeclarationItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InnerDeclarationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDataTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Data Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDataTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InnerDeclaration_dataType_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InnerDeclaration_dataType_feature", "_UI_InnerDeclaration_type"),
-				 RepositoryPackage.Literals.INNER_DECLARATION__DATA_TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns InnerDeclaration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InnerDeclaration"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((InnerDeclaration)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InnerDeclaration_type") :
-			getString("_UI_InnerDeclaration_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceItemProvider.java
deleted file mode 100644
index 414aae7c9c03d23e2eb2558e33e4b96466a348c0..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceItemProvider.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InterfaceItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterfaceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addParentInterfacesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Parent Interfaces feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addParentInterfacesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Interface_parentInterfaces_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Interface_parentInterfaces_feature", "_UI_Interface_type"),
-				 RepositoryPackage.Literals.INTERFACE__PARENT_INTERFACES,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE__SIGNATURES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Interface.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Interface"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Interface)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Interface_type") :
-			getString("_UI_Interface_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Interface.class)) {
-			case RepositoryPackage.INTERFACE__SIGNATURES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE__SIGNATURES,
-				 RepositoryFactory.eINSTANCE.createSignature()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceProvidingEntityItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceProvidingEntityItemProvider.java
deleted file mode 100644
index 744989f1a6a6f9367d25851fe8b04a58abaec25f..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceProvidingEntityItemProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingEntity;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingEntity} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InterfaceProvidingEntityItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterfaceProvidingEntityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__PROVIDED_ROLES);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__BLACK_BOX_BEHAVIOR);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((InterfaceProvidingEntity)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InterfaceProvidingEntity_type") :
-			getString("_UI_InterfaceProvidingEntity_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(InterfaceProvidingEntity.class)) {
-			case RepositoryPackage.INTERFACE_PROVIDING_ENTITY__PROVIDED_ROLES:
-			case RepositoryPackage.INTERFACE_PROVIDING_ENTITY__BLACK_BOX_BEHAVIOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__PROVIDED_ROLES,
-				 RepositoryFactory.eINSTANCE.createProvidedRole()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_PROVIDING_ENTITY__BLACK_BOX_BEHAVIOR,
-				 ServicebehaviorFactory.eINSTANCE.createBlackBoxBehavior()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceProvidingRequiringEntityItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceProvidingRequiringEntityItemProvider.java
deleted file mode 100644
index b4f3b63f18ee5537bf8d574a3db02333626c598d..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceProvidingRequiringEntityItemProvider.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRequiringEntity;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRequiringEntity} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InterfaceProvidingRequiringEntityItemProvider
-	extends InterfaceProvidingEntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterfaceProvidingRequiringEntityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRelationshipPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Relationship feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRelationshipPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InterfaceProvidingRequiringEntity_relationship_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InterfaceProvidingRequiringEntity_relationship_feature", "_UI_InterfaceProvidingRequiringEntity_type"),
-				 RepositoryPackage.Literals.INTERFACE_PROVIDING_REQUIRING_ENTITY__RELATIONSHIP,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_REQUIRING_ENTITY__REQUIRED_ROLES);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_PROVIDING_REQUIRING_ENTITY__COARSE_GRAINED_BEHAVIOR);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((InterfaceProvidingRequiringEntity)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InterfaceProvidingRequiringEntity_type") :
-			getString("_UI_InterfaceProvidingRequiringEntity_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(InterfaceProvidingRequiringEntity.class)) {
-			case RepositoryPackage.INTERFACE_PROVIDING_REQUIRING_ENTITY__REQUIRED_ROLES:
-			case RepositoryPackage.INTERFACE_PROVIDING_REQUIRING_ENTITY__COARSE_GRAINED_BEHAVIOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_REQUIRING_ENTITY__REQUIRED_ROLES,
-				 RepositoryFactory.eINSTANCE.createRequiredRole()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_PROVIDING_REQUIRING_ENTITY__COARSE_GRAINED_BEHAVIOR,
-				 ServicebehaviorFactory.eINSTANCE.createCoarseGrainedBehavior()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceRequiringEntityItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceRequiringEntityItemProvider.java
deleted file mode 100644
index d294a7f3428323f48551a9557e122aef71ac4303..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/InterfaceRequiringEntityItemProvider.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceRequiringEntity;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceRequiringEntity} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InterfaceRequiringEntityItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InterfaceRequiringEntityItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.INTERFACE_REQUIRING_ENTITY__REQUIRED_ROLES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((InterfaceRequiringEntity)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InterfaceRequiringEntity_type") :
-			getString("_UI_InterfaceRequiringEntity_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(InterfaceRequiringEntity.class)) {
-			case RepositoryPackage.INTERFACE_REQUIRING_ENTITY__REQUIRED_ROLES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.INTERFACE_REQUIRING_ENTITY__REQUIRED_ROLES,
-				 RepositoryFactory.eINSTANCE.createRequiredRole()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ParameterItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ParameterItemProvider.java
deleted file mode 100644
index ffc9e2e94a82361723067d7cf949ce03c529a6aa..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/ParameterItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.NamedElementItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Parameter;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Parameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ParameterItemProvider
-	extends NamedElementItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addModifierPropertyDescriptor(object);
-			addDataTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Modifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addModifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Parameter_modifier_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Parameter_modifier_feature", "_UI_Parameter_type"),
-				 RepositoryPackage.Literals.PARAMETER__MODIFIER,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Data Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDataTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Parameter_dataType_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Parameter_dataType_feature", "_UI_Parameter_type"),
-				 RepositoryPackage.Literals.PARAMETER__DATA_TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Parameter)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Parameter_type") :
-			getString("_UI_Parameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Parameter.class)) {
-			case RepositoryPackage.PARAMETER__MODIFIER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryComponentItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryComponentItemProvider.java
deleted file mode 100644
index 154a87d9d3fd7cba6b7c4a469fa68aaa9a37205a..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryComponentItemProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryComponent;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryComponent} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RepositoryComponentItemProvider
-	extends InterfaceProvidingRequiringEntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RepositoryComponentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns RepositoryComponent.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RepositoryComponent"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((RepositoryComponent)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RepositoryComponent_type") :
-			getString("_UI_RepositoryComponent_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryItemProvider.java
deleted file mode 100644
index a103aaa1669107d2a9389a1aa3737ea5a9acba26..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryItemProvider.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RepositoryItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RepositoryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.REPOSITORY__IMPORTS);
-			childrenFeatures.add(RepositoryPackage.Literals.REPOSITORY__DATATYPES);
-			childrenFeatures.add(RepositoryPackage.Literals.REPOSITORY__INTERFACES);
-			childrenFeatures.add(RepositoryPackage.Literals.REPOSITORY__COMPONENTS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Repository.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Repository"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Repository)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Repository_type") :
-			getString("_UI_Repository_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Repository.class)) {
-			case RepositoryPackage.REPOSITORY__IMPORTS:
-			case RepositoryPackage.REPOSITORY__DATATYPES:
-			case RepositoryPackage.REPOSITORY__INTERFACES:
-			case RepositoryPackage.REPOSITORY__COMPONENTS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.REPOSITORY__IMPORTS,
-				 RepositoryFactory.eINSTANCE.createImport()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.REPOSITORY__DATATYPES,
-				 RepositoryFactory.eINSTANCE.createCollectionDataType()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.REPOSITORY__DATATYPES,
-				 RepositoryFactory.eINSTANCE.createCompositeDataType()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.REPOSITORY__DATATYPES,
-				 RepositoryFactory.eINSTANCE.createPrimitiveDataType()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.REPOSITORY__INTERFACES,
-				 RepositoryFactory.eINSTANCE.createInterface()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.REPOSITORY__COMPONENTS,
-				 RepositoryFactory.eINSTANCE.createBasicComponent()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.REPOSITORY__COMPONENTS,
-				 RepositoryFactory.eINSTANCE.createCompositeComponent()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.REPOSITORY__COMPONENTS,
-				 RepositoryFactory.eINSTANCE.createSubSystem()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryItemProviderAdapterFactory.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryItemProviderAdapterFactory.java
deleted file mode 100644
index 5eadb765eec8644dcdc61ad239a60bfa3e428f5b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RepositoryItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,632 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.util.RepositoryAdapterFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RepositoryItemProviderAdapterFactory extends RepositoryAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RepositoryItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Import} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ImportItemProvider importItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Import}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createImportAdapter() {
-		if (importItemProvider == null) {
-			importItemProvider = new ImportItemProvider(this);
-		}
-
-		return importItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.RequiredRole} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RequiredRoleItemProvider requiredRoleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.RequiredRole}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRequiredRoleAdapter() {
-		if (requiredRoleItemProvider == null) {
-			requiredRoleItemProvider = new RequiredRoleItemProvider(this);
-		}
-
-		return requiredRoleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.ProvidedRole} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProvidedRoleItemProvider providedRoleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.ProvidedRole}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createProvidedRoleAdapter() {
-		if (providedRoleItemProvider == null) {
-			providedRoleItemProvider = new ProvidedRoleItemProvider(this);
-		}
-
-		return providedRoleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InterfaceItemProvider interfaceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createInterfaceAdapter() {
-		if (interfaceItemProvider == null) {
-			interfaceItemProvider = new InterfaceItemProvider(this);
-		}
-
-		return interfaceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Signature} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SignatureItemProvider signatureItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Signature}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createSignatureAdapter() {
-		if (signatureItemProvider == null) {
-			signatureItemProvider = new SignatureItemProvider(this);
-		}
-
-		return signatureItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Parameter} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParameterItemProvider parameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Parameter}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createParameterAdapter() {
-		if (parameterItemProvider == null) {
-			parameterItemProvider = new ParameterItemProvider(this);
-		}
-
-		return parameterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RepositoryItemProvider repositoryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRepositoryAdapter() {
-		if (repositoryItemProvider == null) {
-			repositoryItemProvider = new RepositoryItemProvider(this);
-		}
-
-		return repositoryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.BasicComponent} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BasicComponentItemProvider basicComponentItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.BasicComponent}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBasicComponentAdapter() {
-		if (basicComponentItemProvider == null) {
-			basicComponentItemProvider = new BasicComponentItemProvider(this);
-		}
-
-		return basicComponentItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Semaphore} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SemaphoreItemProvider semaphoreItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Semaphore}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createSemaphoreAdapter() {
-		if (semaphoreItemProvider == null) {
-			semaphoreItemProvider = new SemaphoreItemProvider(this);
-		}
-
-		return semaphoreItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeComponent} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompositeComponentItemProvider compositeComponentItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeComponent}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompositeComponentAdapter() {
-		if (compositeComponentItemProvider == null) {
-			compositeComponentItemProvider = new CompositeComponentItemProvider(this);
-		}
-
-		return compositeComponentItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.SubSystem} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SubSystemItemProvider subSystemItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.SubSystem}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createSubSystemAdapter() {
-		if (subSystemItemProvider == null) {
-			subSystemItemProvider = new SubSystemItemProvider(this);
-		}
-
-		return subSystemItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CollectionDataType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CollectionDataTypeItemProvider collectionDataTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CollectionDataType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCollectionDataTypeAdapter() {
-		if (collectionDataTypeItemProvider == null) {
-			collectionDataTypeItemProvider = new CollectionDataTypeItemProvider(this);
-		}
-
-		return collectionDataTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeDataType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompositeDataTypeItemProvider compositeDataTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.CompositeDataType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompositeDataTypeAdapter() {
-		if (compositeDataTypeItemProvider == null) {
-			compositeDataTypeItemProvider = new CompositeDataTypeItemProvider(this);
-		}
-
-		return compositeDataTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.PrimitiveDataType} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PrimitiveDataTypeItemProvider primitiveDataTypeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.PrimitiveDataType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPrimitiveDataTypeAdapter() {
-		if (primitiveDataTypeItemProvider == null) {
-			primitiveDataTypeItemProvider = new PrimitiveDataTypeItemProvider(this);
-		}
-
-		return primitiveDataTypeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyContext} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AssemblyContextItemProvider assemblyContextItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyContext}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAssemblyContextAdapter() {
-		if (assemblyContextItemProvider == null) {
-			assemblyContextItemProvider = new AssemblyContextItemProvider(this);
-		}
-
-		return assemblyContextItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyConnector} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AssemblyConnectorItemProvider assemblyConnectorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyConnector}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAssemblyConnectorAdapter() {
-		if (assemblyConnectorItemProvider == null) {
-			assemblyConnectorItemProvider = new AssemblyConnectorItemProvider(this);
-		}
-
-		return assemblyConnectorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.ProvidedDelegationConnector} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ProvidedDelegationConnectorItemProvider providedDelegationConnectorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.ProvidedDelegationConnector}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createProvidedDelegationConnectorAdapter() {
-		if (providedDelegationConnectorItemProvider == null) {
-			providedDelegationConnectorItemProvider = new ProvidedDelegationConnectorItemProvider(this);
-		}
-
-		return providedDelegationConnectorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.RequiredDelegationConnector} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RequiredDelegationConnectorItemProvider requiredDelegationConnectorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.RequiredDelegationConnector}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRequiredDelegationConnectorAdapter() {
-		if (requiredDelegationConnectorItemProvider == null) {
-			requiredDelegationConnectorItemProvider = new RequiredDelegationConnectorItemProvider(this);
-		}
-
-		return requiredDelegationConnectorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.InnerDeclaration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InnerDeclarationItemProvider innerDeclarationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.InnerDeclaration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createInnerDeclarationAdapter() {
-		if (innerDeclarationItemProvider == null) {
-			innerDeclarationItemProvider = new InnerDeclarationItemProvider(this);
-		}
-
-		return innerDeclarationItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (importItemProvider != null) importItemProvider.dispose();
-		if (requiredRoleItemProvider != null) requiredRoleItemProvider.dispose();
-		if (providedRoleItemProvider != null) providedRoleItemProvider.dispose();
-		if (interfaceItemProvider != null) interfaceItemProvider.dispose();
-		if (signatureItemProvider != null) signatureItemProvider.dispose();
-		if (parameterItemProvider != null) parameterItemProvider.dispose();
-		if (repositoryItemProvider != null) repositoryItemProvider.dispose();
-		if (basicComponentItemProvider != null) basicComponentItemProvider.dispose();
-		if (semaphoreItemProvider != null) semaphoreItemProvider.dispose();
-		if (compositeComponentItemProvider != null) compositeComponentItemProvider.dispose();
-		if (subSystemItemProvider != null) subSystemItemProvider.dispose();
-		if (collectionDataTypeItemProvider != null) collectionDataTypeItemProvider.dispose();
-		if (compositeDataTypeItemProvider != null) compositeDataTypeItemProvider.dispose();
-		if (primitiveDataTypeItemProvider != null) primitiveDataTypeItemProvider.dispose();
-		if (assemblyContextItemProvider != null) assemblyContextItemProvider.dispose();
-		if (assemblyConnectorItemProvider != null) assemblyConnectorItemProvider.dispose();
-		if (providedDelegationConnectorItemProvider != null) providedDelegationConnectorItemProvider.dispose();
-		if (requiredDelegationConnectorItemProvider != null) requiredDelegationConnectorItemProvider.dispose();
-		if (innerDeclarationItemProvider != null) innerDeclarationItemProvider.dispose();
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RoleItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RoleItemProvider.java
deleted file mode 100644
index 661bb1454c4b3c90a2473e9d205fec9cc0d646ff..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/RoleItemProvider.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Role;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Role} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RoleItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Role)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Role_type") :
-			getString("_UI_Role_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SemaphoreItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SemaphoreItemProvider.java
deleted file mode 100644
index a9e15035e741454da837d96a44f52922f541dd67..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SemaphoreItemProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.AdaptableEntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Semaphore;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Semaphore} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SemaphoreItemProvider
-	extends AdaptableEntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SemaphoreItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCapacityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Capacity feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCapacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Semaphore_capacity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Semaphore_capacity_feature", "_UI_Semaphore_type"),
-				 RepositoryPackage.Literals.SEMAPHORE__CAPACITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Semaphore.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Semaphore"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Semaphore)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Semaphore_type") :
-			getString("_UI_Semaphore_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Semaphore.class)) {
-			case RepositoryPackage.SEMAPHORE__CAPACITY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SignatureItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SignatureItemProvider.java
deleted file mode 100644
index 48a02bd8c4b6ba2239f1d2ed68250e818e82a752..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SignatureItemProvider.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.core.provider.EntityItemProvider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.Signature;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.Signature} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SignatureItemProvider
-	extends EntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SignatureItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addReturnTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Return Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReturnTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Signature_returnType_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Signature_returnType_feature", "_UI_Signature_type"),
-				 RepositoryPackage.Literals.SIGNATURE__RETURN_TYPE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.SIGNATURE__PARAMETERS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Signature.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Signature"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Signature)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Signature_type") :
-			getString("_UI_Signature_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Signature.class)) {
-			case RepositoryPackage.SIGNATURE__PARAMETERS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.SIGNATURE__PARAMETERS,
-				 RepositoryFactory.eINSTANCE.createParameter()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SubSystemItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SubSystemItemProvider.java
deleted file mode 100644
index 38684c7603519e27228b3d05e4f8468fcffd2ed9..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/provider/SubSystemItemProvider.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.repository.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.SubSystem;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.repository.SubSystem} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SubSystemItemProvider
-	extends RepositoryComponentItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SubSystemItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONTEXTS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONNECTORS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__PROVIDED_DELEGATION_CONNECTORS);
-			childrenFeatures.add(RepositoryPackage.Literals.COMPOSED_STRUCTURE__REQUIRED_DELEGATION_CONNECTORS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns SubSystem.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SubSystem"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((SubSystem)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SubSystem_type") :
-			getString("_UI_SubSystem_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SubSystem.class)) {
-			case RepositoryPackage.SUB_SYSTEM__ASSEMBLY_CONTEXTS:
-			case RepositoryPackage.SUB_SYSTEM__ASSEMBLY_CONNECTORS:
-			case RepositoryPackage.SUB_SYSTEM__PROVIDED_DELEGATION_CONNECTORS:
-			case RepositoryPackage.SUB_SYSTEM__REQUIRED_DELEGATION_CONNECTORS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONTEXTS,
-				 RepositoryFactory.eINSTANCE.createAssemblyContext()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__ASSEMBLY_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createAssemblyConnector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__PROVIDED_DELEGATION_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createProvidedDelegationConnector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(RepositoryPackage.Literals.COMPOSED_STRUCTURE__REQUIRED_DELEGATION_CONNECTORS,
-				 RepositoryFactory.eINSTANCE.createRequiredDelegationConnector()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java
deleted file mode 100644
index 25a96450046eb224181069f343583e5fd734d320..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AbstractActionItemProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AbstractAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AbstractActionItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns AbstractAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AbstractAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_AbstractAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java
deleted file mode 100644
index 1746b8a3294466d442b98c8ef321ef18f34accf3..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/AcquireActionItemProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AcquireAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AcquireActionItemProvider
-	extends AbstractActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AcquireActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSemaphorePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Semaphore feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSemaphorePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AcquireAction_semaphore_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AcquireAction_semaphore_feature", "_UI_AcquireAction_type"),
-				 ServicebehaviorPackage.Literals.ACQUIRE_ACTION__SEMAPHORE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns AcquireAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AcquireAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_AcquireAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BlackBoxBehaviorItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BlackBoxBehaviorItemProvider.java
deleted file mode 100644
index 3895a086dc50c77d408a0be7a560cf7808d88ff5..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BlackBoxBehaviorItemProvider.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BlackBoxBehavior;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BlackBoxBehavior} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BlackBoxBehaviorItemProvider
-	extends ServiceBehaviorAbstractionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BlackBoxBehaviorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescribedEntityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Described Entity feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescribedEntityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BlackBoxBehavior_describedEntity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BlackBoxBehavior_describedEntity_feature", "_UI_BlackBoxBehavior_type"),
-				 ServicebehaviorPackage.Literals.BLACK_BOX_BEHAVIOR__DESCRIBED_ENTITY,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.BLACK_BOX_BEHAVIOR__RESPONSE_TIME_SPECIFICATION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns BlackBoxBehavior.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BlackBoxBehavior"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_BlackBoxBehavior_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BlackBoxBehavior.class)) {
-			case ServicebehaviorPackage.BLACK_BOX_BEHAVIOR__RESPONSE_TIME_SPECIFICATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.BLACK_BOX_BEHAVIOR__RESPONSE_TIME_SPECIFICATION,
-				 ServicebehaviorFactory.eINSTANCE.createResponseTimeSpecification()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java
deleted file mode 100644
index 2f62aef7d8530eb398e34eeeb39bc16e5dd9e3d6..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchActionItemProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BranchAction;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BranchAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BranchActionItemProvider
-	extends AbstractActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BranchActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.BRANCH_ACTION__BRANCHES);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.BRANCH_ACTION__BRANCH_PROBABILITIES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns BranchAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BranchAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_BranchAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BranchAction.class)) {
-			case ServicebehaviorPackage.BRANCH_ACTION__BRANCHES:
-			case ServicebehaviorPackage.BRANCH_ACTION__BRANCH_PROBABILITIES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.BRANCH_ACTION__BRANCHES,
-				 ServicebehaviorFactory.eINSTANCE.createComponentInternalBehavior()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.BRANCH_ACTION__BRANCH_PROBABILITIES,
-				 ServicebehaviorFactory.eINSTANCE.createBranchProbabilities()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchProbabilitiesItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchProbabilitiesItemProvider.java
deleted file mode 100644
index 79f996e5f091747d38e3f59fc7c04f971abcf3d6..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/BranchProbabilitiesItemProvider.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider.ControlFlowSpecificationItemProvider;
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BranchProbabilities} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BranchProbabilitiesItemProvider
-	extends ControlFlowSpecificationItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BranchProbabilitiesItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addProbabilitiesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Probabilities feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProbabilitiesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BranchProbabilities_probabilities_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BranchProbabilities_probabilities_feature", "_UI_BranchProbabilities_type"),
-				 ServicebehaviorPackage.Literals.BRANCH_PROBABILITIES__PROBABILITIES,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns BranchProbabilities.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BranchProbabilities"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_BranchProbabilities_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/CallFrequencyItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/CallFrequencyItemProvider.java
deleted file mode 100644
index 799ea2a459b5dfa21489730ab08c88010bd14f7e..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/CallFrequencyItemProvider.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider.ControlFlowSpecificationItemProvider;
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CallFrequency} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CallFrequencyItemProvider
-	extends ControlFlowSpecificationItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CallFrequencyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFrequencyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Frequency feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFrequencyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CallFrequency_frequency_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CallFrequency_frequency_feature", "_UI_CallFrequency_type"),
-				 ServicebehaviorPackage.Literals.CALL_FREQUENCY__FREQUENCY,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns CallFrequency.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CallFrequency"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_CallFrequency_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/CoarseGrainedBehaviorItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/CoarseGrainedBehaviorItemProvider.java
deleted file mode 100644
index 5a3ca04d55812dc20ee2a5557e17d623ca210edc..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/CoarseGrainedBehaviorItemProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CoarseGrainedBehaviorItemProvider
-	extends ServiceBehaviorAbstractionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CoarseGrainedBehaviorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescribedEntityPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Described Entity feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescribedEntityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CoarseGrainedBehavior_describedEntity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CoarseGrainedBehavior_describedEntity_feature", "_UI_CoarseGrainedBehavior_type"),
-				 ServicebehaviorPackage.Literals.COARSE_GRAINED_BEHAVIOR__DESCRIBED_ENTITY,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND_SPECIFICATION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CoarseGrainedBehavior.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CoarseGrainedBehavior"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_CoarseGrainedBehavior_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CoarseGrainedBehavior.class)) {
-			case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY:
-			case ServicebehaviorPackage.COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND_SPECIFICATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COARSE_GRAINED_BEHAVIOR__EXTERNAL_CALL_FREQUENCY,
-				 ServicebehaviorFactory.eINSTANCE.createExternalCallFrequency()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COARSE_GRAINED_BEHAVIOR__RESOURCE_DEMAND_SPECIFICATION,
-				 ServicebehaviorFactory.eINSTANCE.createResourceDemandSpecification()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ComponentInternalBehaviorItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ComponentInternalBehaviorItemProvider.java
deleted file mode 100644
index 693afe430a09794f4b71b2de0d0dbda1a32102cc..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ComponentInternalBehaviorItemProvider.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ComponentInternalBehavior;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ComponentInternalBehavior} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ComponentInternalBehaviorItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComponentInternalBehaviorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ComponentInternalBehavior.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ComponentInternalBehavior"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ComponentInternalBehavior_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ComponentInternalBehavior.class)) {
-			case ServicebehaviorPackage.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createStartAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createStopAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createAcquireAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createReleaseAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createInternalAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createForkAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createBranchAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createLoopAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.COMPONENT_INTERNAL_BEHAVIOR__ACTIONS,
-				 ServicebehaviorFactory.eINSTANCE.createExternalCallAction()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java
deleted file mode 100644
index 17b65e3f38b645d8328768758b94fa233801fb2c..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallActionItemProvider.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExternalCallActionItemProvider
-	extends AbstractActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExternalCallActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSignaturePropertyDescriptor(object);
-			addRequiredRolePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Signature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSignaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExternalCall_signature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExternalCall_signature_feature", "_UI_ExternalCall_type"),
-				 ServicebehaviorPackage.Literals.EXTERNAL_CALL__SIGNATURE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Required Role feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRequiredRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExternalCall_requiredRole_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExternalCall_requiredRole_feature", "_UI_ExternalCall_type"),
-				 ServicebehaviorPackage.Literals.EXTERNAL_CALL__REQUIRED_ROLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ExternalCallAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalCallAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ExternalCallAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallFrequencyItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallFrequencyItemProvider.java
deleted file mode 100644
index 45be11a42b160765600d70a72aeb39a1e6d754d5..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallFrequencyItemProvider.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallFrequency;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallFrequency} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExternalCallFrequencyItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExternalCallFrequencyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.EXTERNAL_CALL_FREQUENCY__EXTERNAL_CALL);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.EXTERNAL_CALL_FREQUENCY__FREQUENCY);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ExternalCallFrequency.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalCallFrequency"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ExternalCallFrequency_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ExternalCallFrequency.class)) {
-			case ServicebehaviorPackage.EXTERNAL_CALL_FREQUENCY__EXTERNAL_CALL:
-			case ServicebehaviorPackage.EXTERNAL_CALL_FREQUENCY__FREQUENCY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.EXTERNAL_CALL_FREQUENCY__EXTERNAL_CALL,
-				 ServicebehaviorFactory.eINSTANCE.createExternalCallAction()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.EXTERNAL_CALL_FREQUENCY__EXTERNAL_CALL,
-				 ServicebehaviorFactory.eINSTANCE.createExternalCall()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.EXTERNAL_CALL_FREQUENCY__FREQUENCY,
-				 ServicebehaviorFactory.eINSTANCE.createCallFrequency()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallItemProvider.java
deleted file mode 100644
index 830700608338956fb8bffeb114ca647e8c6cdb1d..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ExternalCallItemProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCall} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExternalCallItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExternalCallItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSignaturePropertyDescriptor(object);
-			addRequiredRolePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Signature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSignaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExternalCall_signature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExternalCall_signature_feature", "_UI_ExternalCall_type"),
-				 ServicebehaviorPackage.Literals.EXTERNAL_CALL__SIGNATURE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Required Role feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRequiredRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExternalCall_requiredRole_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ExternalCall_requiredRole_feature", "_UI_ExternalCall_type"),
-				 ServicebehaviorPackage.Literals.EXTERNAL_CALL__REQUIRED_ROLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ExternalCall.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExternalCall"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ExternalCall_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/FineGrainedBehaviorItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/FineGrainedBehaviorItemProvider.java
deleted file mode 100644
index 840560b7e9ec335e83c9135e9436eff92a9062f4..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/FineGrainedBehaviorItemProvider.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.FineGrainedBehavior;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.FineGrainedBehavior} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FineGrainedBehaviorItemProvider
-	extends ServiceBehaviorAbstractionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FineGrainedBehaviorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addBasicComponentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Basic Component feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBasicComponentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FineGrainedBehavior_basicComponent_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FineGrainedBehavior_basicComponent_feature", "_UI_FineGrainedBehavior_type"),
-				 ServicebehaviorPackage.Literals.FINE_GRAINED_BEHAVIOR__BASIC_COMPONENT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.FINE_GRAINED_BEHAVIOR__BEHAVIOR);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns FineGrainedBehavior.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FineGrainedBehavior"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_FineGrainedBehavior_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FineGrainedBehavior.class)) {
-			case ServicebehaviorPackage.FINE_GRAINED_BEHAVIOR__BEHAVIOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.FINE_GRAINED_BEHAVIOR__BEHAVIOR,
-				 ServicebehaviorFactory.eINSTANCE.createComponentInternalBehavior()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java
deleted file mode 100644
index 579b4f2bcf02af8ad747a27583036dc4155c422b..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ForkActionItemProvider.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ForkAction;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ForkAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ForkActionItemProvider
-	extends AbstractActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ForkActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addWithSynchronizationBarrierPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the With Synchronization Barrier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWithSynchronizationBarrierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ForkAction_withSynchronizationBarrier_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ForkAction_withSynchronizationBarrier_feature", "_UI_ForkAction_type"),
-				 ServicebehaviorPackage.Literals.FORK_ACTION__WITH_SYNCHRONIZATION_BARRIER,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.FORK_ACTION__FORKED_BEHAVIORS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ForkAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ForkAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		ForkAction forkAction = (ForkAction)object;
-		return getString("_UI_ForkAction_type") + " " + forkAction.isWithSynchronizationBarrier();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ForkAction.class)) {
-			case ServicebehaviorPackage.FORK_ACTION__WITH_SYNCHRONIZATION_BARRIER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case ServicebehaviorPackage.FORK_ACTION__FORKED_BEHAVIORS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.FORK_ACTION__FORKED_BEHAVIORS,
-				 ServicebehaviorFactory.eINSTANCE.createComponentInternalBehavior()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java
deleted file mode 100644
index 76db724005c6da90ed94b39cad9ed7a324e31253..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/InternalActionItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.InternalAction;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.InternalAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InternalActionItemProvider
-	extends AbstractActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InternalActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.INTERNAL_ACTION__RESOURCE_DEMAND_SPECIFICATION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns InternalAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InternalAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_InternalAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(InternalAction.class)) {
-			case ServicebehaviorPackage.INTERNAL_ACTION__RESOURCE_DEMAND_SPECIFICATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.INTERNAL_ACTION__RESOURCE_DEMAND_SPECIFICATION,
-				 ServicebehaviorFactory.eINSTANCE.createResourceDemandSpecification()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java
deleted file mode 100644
index 1054f3bb9c2530dddc280b0318c0a8f604f27dce..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopActionItemProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopAction;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LoopActionItemProvider
-	extends AbstractActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LoopActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.LOOP_ACTION__LOOP_BODY_BEHAVIOR);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.LOOP_ACTION__LOOP_ITERATION_COUNT_DISTRIBUTION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns LoopAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LoopAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_LoopAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(LoopAction.class)) {
-			case ServicebehaviorPackage.LOOP_ACTION__LOOP_BODY_BEHAVIOR:
-			case ServicebehaviorPackage.LOOP_ACTION__LOOP_ITERATION_COUNT_DISTRIBUTION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.LOOP_ACTION__LOOP_BODY_BEHAVIOR,
-				 ServicebehaviorFactory.eINSTANCE.createComponentInternalBehavior()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.LOOP_ACTION__LOOP_ITERATION_COUNT_DISTRIBUTION,
-				 ServicebehaviorFactory.eINSTANCE.createLoopIterationCountDistribution()));
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopIterationCountDistributionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopIterationCountDistributionItemProvider.java
deleted file mode 100644
index 723441286f1565b6c968630fb0d879526aec1efe..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/LoopIterationCountDistributionItemProvider.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.provider.ControlFlowSpecificationItemProvider;
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopIterationCountDistribution} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LoopIterationCountDistributionItemProvider
-	extends ControlFlowSpecificationItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LoopIterationCountDistributionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLoopIterationCountDistributionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Loop Iteration Count Distribution feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLoopIterationCountDistributionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LoopIterationCountDistribution_loopIterationCountDistribution_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LoopIterationCountDistribution_loopIterationCountDistribution_feature", "_UI_LoopIterationCountDistribution_type"),
-				 ServicebehaviorPackage.Literals.LOOP_ITERATION_COUNT_DISTRIBUTION__LOOP_ITERATION_COUNT_DISTRIBUTION,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns LoopIterationCountDistribution.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LoopIterationCountDistribution"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_LoopIterationCountDistribution_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java
deleted file mode 100644
index ae82ecb7599740ea43dfe2d1aaf3e68351f69261..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ReleaseActionItemProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ReleaseAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReleaseActionItemProvider
-	extends AbstractActionItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReleaseActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSemaphorePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Semaphore feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSemaphorePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ReleaseAction_semaphore_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ReleaseAction_semaphore_feature", "_UI_ReleaseAction_type"),
-				 ServicebehaviorPackage.Literals.RELEASE_ACTION__SEMAPHORE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ReleaseAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReleaseAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ReleaseAction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ServiceBehaviorAbstractionItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ServiceBehaviorAbstractionItemProvider.java
deleted file mode 100644
index 81c40bcda45b79dd7126cd10c2ca799661975ede..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ServiceBehaviorAbstractionItemProvider.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.parameterdependencies.ParameterdependenciesFactory;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServiceBehaviorAbstraction;
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServiceBehaviorAbstraction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ServiceBehaviorAbstractionItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceBehaviorAbstractionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescribedSignaturePropertyDescriptor(object);
-			addProvidedRolePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Described Signature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescribedSignaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ServiceBehaviorAbstraction_describedSignature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceBehaviorAbstraction_describedSignature_feature", "_UI_ServiceBehaviorAbstraction_type"),
-				 ServicebehaviorPackage.Literals.SERVICE_BEHAVIOR_ABSTRACTION__DESCRIBED_SIGNATURE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Provided Role feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addProvidedRolePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ServiceBehaviorAbstraction_providedRole_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceBehaviorAbstraction_providedRole_feature", "_UI_ServiceBehaviorAbstraction_type"),
-				 ServicebehaviorPackage.Literals.SERVICE_BEHAVIOR_ABSTRACTION__PROVIDED_ROLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ServicebehaviorPackage.Literals.SERVICE_BEHAVIOR_ABSTRACTION__INFLUENCING_PARAMETER);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ServiceBehaviorAbstraction_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ServiceBehaviorAbstraction.class)) {
-			case ServicebehaviorPackage.SERVICE_BEHAVIOR_ABSTRACTION__INFLUENCING_PARAMETER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.SERVICE_BEHAVIOR_ABSTRACTION__INFLUENCING_PARAMETER,
-				 ParameterdependenciesFactory.eINSTANCE.createInfluencingParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.SERVICE_BEHAVIOR_ABSTRACTION__INFLUENCING_PARAMETER,
-				 ParameterdependenciesFactory.eINSTANCE.createServiceInputParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.SERVICE_BEHAVIOR_ABSTRACTION__INFLUENCING_PARAMETER,
-				 ParameterdependenciesFactory.eINSTANCE.createExternalCallReturnParameter()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(ServicebehaviorPackage.Literals.SERVICE_BEHAVIOR_ABSTRACTION__INFLUENCING_PARAMETER,
-				 ParameterdependenciesFactory.eINSTANCE.createExternalCallParameter()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ServicebehaviorItemProviderAdapterFactory.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ServicebehaviorItemProviderAdapterFactory.java
deleted file mode 100644
index 86129a4c590c6e8dfc415355668f11079e81e47e..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/servicebehavior/provider/ServicebehaviorItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.provider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.util.ServicebehaviorAdapterFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ServicebehaviorItemProviderAdapterFactory extends ServicebehaviorAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServicebehaviorItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.FineGrainedBehavior} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FineGrainedBehaviorItemProvider fineGrainedBehaviorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.FineGrainedBehavior}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFineGrainedBehaviorAdapter() {
-		if (fineGrainedBehaviorItemProvider == null) {
-			fineGrainedBehaviorItemProvider = new FineGrainedBehaviorItemProvider(this);
-		}
-
-		return fineGrainedBehaviorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ComponentInternalBehavior} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComponentInternalBehaviorItemProvider componentInternalBehaviorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ComponentInternalBehavior}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createComponentInternalBehaviorAdapter() {
-		if (componentInternalBehaviorItemProvider == null) {
-			componentInternalBehaviorItemProvider = new ComponentInternalBehaviorItemProvider(this);
-		}
-
-		return componentInternalBehaviorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.StartAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StartActionItemProvider startActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.StartAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createStartActionAdapter() {
-		if (startActionItemProvider == null) {
-			startActionItemProvider = new StartActionItemProvider(this);
-		}
-
-		return startActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.StopAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StopActionItemProvider stopActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.StopAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createStopActionAdapter() {
-		if (stopActionItemProvider == null) {
-			stopActionItemProvider = new StopActionItemProvider(this);
-		}
-
-		return stopActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AcquireAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AcquireActionItemProvider acquireActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AcquireAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAcquireActionAdapter() {
-		if (acquireActionItemProvider == null) {
-			acquireActionItemProvider = new AcquireActionItemProvider(this);
-		}
-
-		return acquireActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ReleaseAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReleaseActionItemProvider releaseActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ReleaseAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createReleaseActionAdapter() {
-		if (releaseActionItemProvider == null) {
-			releaseActionItemProvider = new ReleaseActionItemProvider(this);
-		}
-
-		return releaseActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.InternalAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InternalActionItemProvider internalActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.InternalAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createInternalActionAdapter() {
-		if (internalActionItemProvider == null) {
-			internalActionItemProvider = new InternalActionItemProvider(this);
-		}
-
-		return internalActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ForkAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ForkActionItemProvider forkActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ForkAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createForkActionAdapter() {
-		if (forkActionItemProvider == null) {
-			forkActionItemProvider = new ForkActionItemProvider(this);
-		}
-
-		return forkActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BranchAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BranchActionItemProvider branchActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BranchAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBranchActionAdapter() {
-		if (branchActionItemProvider == null) {
-			branchActionItemProvider = new BranchActionItemProvider(this);
-		}
-
-		return branchActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BranchProbabilities} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BranchProbabilitiesItemProvider branchProbabilitiesItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BranchProbabilities}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBranchProbabilitiesAdapter() {
-		if (branchProbabilitiesItemProvider == null) {
-			branchProbabilitiesItemProvider = new BranchProbabilitiesItemProvider(this);
-		}
-
-		return branchProbabilitiesItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LoopActionItemProvider loopActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLoopActionAdapter() {
-		if (loopActionItemProvider == null) {
-			loopActionItemProvider = new LoopActionItemProvider(this);
-		}
-
-		return loopActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopIterationCountDistribution} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LoopIterationCountDistributionItemProvider loopIterationCountDistributionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopIterationCountDistribution}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLoopIterationCountDistributionAdapter() {
-		if (loopIterationCountDistributionItemProvider == null) {
-			loopIterationCountDistributionItemProvider = new LoopIterationCountDistributionItemProvider(this);
-		}
-
-		return loopIterationCountDistributionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExternalCallActionItemProvider externalCallActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExternalCallActionAdapter() {
-		if (externalCallActionItemProvider == null) {
-			externalCallActionItemProvider = new ExternalCallActionItemProvider(this);
-		}
-
-		return externalCallActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCall} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExternalCallItemProvider externalCallItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCall}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExternalCallAdapter() {
-		if (externalCallItemProvider == null) {
-			externalCallItemProvider = new ExternalCallItemProvider(this);
-		}
-
-		return externalCallItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ResourceDemandSpecification} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResourceDemandSpecificationItemProvider resourceDemandSpecificationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ResourceDemandSpecification}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createResourceDemandSpecificationAdapter() {
-		if (resourceDemandSpecificationItemProvider == null) {
-			resourceDemandSpecificationItemProvider = new ResourceDemandSpecificationItemProvider(this);
-		}
-
-		return resourceDemandSpecificationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CoarseGrainedBehaviorItemProvider coarseGrainedBehaviorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CoarseGrainedBehavior}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCoarseGrainedBehaviorAdapter() {
-		if (coarseGrainedBehaviorItemProvider == null) {
-			coarseGrainedBehaviorItemProvider = new CoarseGrainedBehaviorItemProvider(this);
-		}
-
-		return coarseGrainedBehaviorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallFrequency} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExternalCallFrequencyItemProvider externalCallFrequencyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallFrequency}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExternalCallFrequencyAdapter() {
-		if (externalCallFrequencyItemProvider == null) {
-			externalCallFrequencyItemProvider = new ExternalCallFrequencyItemProvider(this);
-		}
-
-		return externalCallFrequencyItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CallFrequency} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CallFrequencyItemProvider callFrequencyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.CallFrequency}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCallFrequencyAdapter() {
-		if (callFrequencyItemProvider == null) {
-			callFrequencyItemProvider = new CallFrequencyItemProvider(this);
-		}
-
-		return callFrequencyItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BlackBoxBehavior} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BlackBoxBehaviorItemProvider blackBoxBehaviorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.BlackBoxBehavior}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBlackBoxBehaviorAdapter() {
-		if (blackBoxBehaviorItemProvider == null) {
-			blackBoxBehaviorItemProvider = new BlackBoxBehaviorItemProvider(this);
-		}
-
-		return blackBoxBehaviorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ResponseTimeSpecification} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResponseTimeSpecificationItemProvider responseTimeSpecificationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ResponseTimeSpecification}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createResponseTimeSpecificationAdapter() {
-		if (responseTimeSpecificationItemProvider == null) {
-			responseTimeSpecificationItemProvider = new ResponseTimeSpecificationItemProvider(this);
-		}
-
-		return responseTimeSpecificationItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (fineGrainedBehaviorItemProvider != null) fineGrainedBehaviorItemProvider.dispose();
-		if (componentInternalBehaviorItemProvider != null) componentInternalBehaviorItemProvider.dispose();
-		if (startActionItemProvider != null) startActionItemProvider.dispose();
-		if (stopActionItemProvider != null) stopActionItemProvider.dispose();
-		if (acquireActionItemProvider != null) acquireActionItemProvider.dispose();
-		if (releaseActionItemProvider != null) releaseActionItemProvider.dispose();
-		if (internalActionItemProvider != null) internalActionItemProvider.dispose();
-		if (forkActionItemProvider != null) forkActionItemProvider.dispose();
-		if (branchActionItemProvider != null) branchActionItemProvider.dispose();
-		if (branchProbabilitiesItemProvider != null) branchProbabilitiesItemProvider.dispose();
-		if (loopActionItemProvider != null) loopActionItemProvider.dispose();
-		if (loopIterationCountDistributionItemProvider != null) loopIterationCountDistributionItemProvider.dispose();
-		if (externalCallActionItemProvider != null) externalCallActionItemProvider.dispose();
-		if (externalCallItemProvider != null) externalCallItemProvider.dispose();
-		if (resourceDemandSpecificationItemProvider != null) resourceDemandSpecificationItemProvider.dispose();
-		if (coarseGrainedBehaviorItemProvider != null) coarseGrainedBehaviorItemProvider.dispose();
-		if (externalCallFrequencyItemProvider != null) externalCallFrequencyItemProvider.dispose();
-		if (callFrequencyItemProvider != null) callFrequencyItemProvider.dispose();
-		if (blackBoxBehaviorItemProvider != null) blackBoxBehaviorItemProvider.dispose();
-		if (responseTimeSpecificationItemProvider != null) responseTimeSpecificationItemProvider.dispose();
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/system/provider/SystemItemProvider.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/system/provider/SystemItemProvider.java
deleted file mode 100644
index a4d4a47e98d6143138e06ad575e34f9b3f3e4f3d..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/system/provider/SystemItemProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.system.provider;
-
-
-import edu.kit.ipd.descartes.mm.applicationlevel.provider.ApplicationlevelEditPlugin;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.repository.provider.ComposedProvidingRequiringEntityItemProvider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.system.System} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SystemItemProvider
-	extends ComposedProvidingRequiringEntityItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SystemItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns System.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/System"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((edu.kit.ipd.descartes.mm.applicationlevel.system.System)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_System_type") :
-			getString("_UI_System_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ApplicationlevelEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/system/provider/SystemItemProviderAdapterFactory.java b/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/system/provider/SystemItemProviderAdapterFactory.java
deleted file mode 100644
index ca665f3931067005857050eae55e369ca2dce7fe..0000000000000000000000000000000000000000
--- a/edu.kit.ipd.descartes.mm.applicationlevel.edit/src/edu/kit/ipd/descartes/mm/applicationlevel/system/provider/SystemItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Copyright 2009-2012, Descartes Research Group, SDQ, IPD, KIT
- */
-package edu.kit.ipd.descartes.mm.applicationlevel.system.provider;
-
-import edu.kit.ipd.descartes.mm.applicationlevel.system.util.SystemAdapterFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SystemItemProviderAdapterFactory extends SystemAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SystemItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link edu.kit.ipd.descartes.mm.applicationlevel.system.System} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SystemItemProvider systemItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link edu.kit.ipd.descartes.mm.applicationlevel.system.System}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createSystemAdapter() {
-		if (systemItemProvider == null) {
-			systemItemProvider = new SystemItemProvider(this);
-		}
-
-		return systemItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (systemItemProvider != null) systemItemProvider.dispose();
-	}
-
-}