Bug 519546 - [MARTE] separate UI aspects (palette) from static profile definition

- Create a new plugin org.eclipse.papyrus.marte.static.profile.ui
- Move palette definition to this new plugin, format XML files for better readability
- Add plugin.xml accordingly
- Create a new feature oep.marte.full.feature that includes palette definition and VSL, remove these aspects from existing core feature

Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: I9627e55ba39462a02728e67e3891454e4cd350ad
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/.classpath b/core/org.eclipse.papyrus.marte.static.profile.ui/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/.project b/core/org.eclipse.papyrus.marte.static.profile.ui/.project
new file mode 100644
index 0000000..84cd9b3
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.marte.static.profile.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..94d61f0
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..954281d
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.marte.static.profile.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..01dd7c4
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="3.1.0";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.marte.static.profile;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.2.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.marte.static.profile.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/about.html b/core/org.eclipse.papyrus.marte.static.profile.ui/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/build.properties b/core/org.eclipse.papyrus.marte.static.profile.ui/build.properties
new file mode 100644
index 0000000..7df5dde
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/build.properties
@@ -0,0 +1,8 @@
+bin.includes = META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               .,\
+               palettes/,\
+               about.html
+src.includes = about.html
+source.. = src/
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GCM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GCM.Palette.xml
new file mode 100644
index 0000000..e37bea9
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GCM.Palette.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+  <content>
+    <drawer iconpath="/icons/drawer.gif" id="Drawer__1283327086671" name="MARTE/GCM">
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+                  id="createCallBehaviorAction2CreationTool_1283327647999" name="GCMInvocationAction (Call Behavior Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocationAction"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+                  id="createCallOperationAction12CreationTool_1283327660625" name="GCMInvocationAction (Call Operation Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocationAction"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+    </drawer>
+    
+        <drawer iconpath="/icons/drawer.gif" id="Drawer__1283328016472" name="MARTE/GQAM">
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+                  id="createCallBehaviorAction11CreationTool_1283328053749" name="GaAcqStep (Call Behavior Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAcqStep"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+                  id="createCallOperationAction12CreationTool_1283328058561" name="GaAcqStep (Call Operation Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAcqStep"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif"
+                  id="createControlFlow1CreationTool_1283328394693" name="GaCommStep (Control Flow)"
+                  refToolId="activity.edges.controlflow">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommStep"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+                  id="createCallOperationAction12CreationTool_1283328402395" name="GaCommStep (Call Operation Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommStep"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+                  id="createCallBehaviorAction11CreationTool_1283328469751" name="GaRelStep (Call Behavior Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRelStep"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+                  id="createCallOperationAction12CreationTool_1283328472204" name="GaRelStep (Call Operation Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRelStep"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+                  id="createCallOperationAction12CreationTool_1283328479595" name="GaRequestedService (Call Operation Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaRequestedService"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+                  id="createStructuredActivityNode3CreationTool_1283328505406" name="GaScenario (Structured Activity Node)"
+                  refToolId="activity.nodes.structuredactions.structuredactivitynode">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaScenario"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+                  id="createStructuredActivityNode3CreationTool_1283328520312" name="GaAnalysisContext (Structured Activity Node)"
+                  refToolId="activity.nodes.structuredactions.structuredactivitynode">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+                  id="createCallBehaviorAction11CreationTool_1283328534686" name="GaStep (Call Behavior Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaStep"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+                  id="createCallOperationAction12CreationTool_1283328537795" name="GaStep (Call Operation Action)"
+                  refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaStep"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+                  id="createStructuredActivityNode3CreationTool_1283328732630" name="GaWorkloadBehavior (Structured Activity Node)"
+                  refToolId="activity.nodes.structuredactions.structuredactivitynode">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadBehavior"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+      <aspectTool description="Create an element with a stereotype"
+                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif"
+                  id="createAcceptEventAction6CreationTool_1283328741427" name="GaWorkloadEvent (Accept Event Action)"
+                  refToolId="activity.nodes.accepteventaction">
+        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+          <stereotypesToApply>
+            <stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadEvent"/>
+          </stereotypesToApply>
+        </postAction>
+      </aspectTool>
+    </drawer>
+    
+    
+  </content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GQAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GQAM.Palette.xml
similarity index 100%
rename from core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GQAM.Palette.xml
rename to core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-GQAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-HLAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-HLAM.Palette.xml
similarity index 100%
rename from core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-HLAM.Palette.xml
rename to core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-HLAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-NFPs.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-NFPs.Palette.xml
new file mode 100644
index 0000000..bcdfbf7
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-NFPs.Palette.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283326405607"
+			name="MARTE/NFPs">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="createLocalPreconditionConstraint1CreationTool_1283326588152"
+				name="NfpConstraint" refToolId="createLocalPreconditionConstraint31CreationTool">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpConstraint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-PAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-PAM.Palette.xml
similarity index 100%
rename from core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-PAM.Palette.xml
rename to core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-PAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SAM.Palette.xml
similarity index 100%
rename from core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SAM.Palette.xml
rename to core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SAM.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SRM.Palette.xml
new file mode 100644
index 0000000..fe522bf
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-SRM.Palette.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283327834664"
+			name="MARTE/SRM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+				id="createStructuredActivityNode3CreationTool_1283327876487" name="MemoryPartition (Structured Activity Node)"
+				refToolId="createStructuredActivityNode3CreationTool">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::MemoryPartition" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-Time.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-Time.Palette.xml
similarity index 100%
rename from core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-Time.Palette.xml
rename to core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ActivityDiag-Time.Palette.xml
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Alloc.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Alloc.Palette.xml
new file mode 100644
index 0000000..b69d0da
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Alloc.Palette.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283167207545"
+			name="MARTE/Alloc">
+			<aspectTool description="Create an Allocate link"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				id="clazz.tool.abstraction_1283167259234" name="Allocate"
+				refToolId="clazz.tool.abstraction">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Allocate" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an Assign element"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				id="clazz.tool.comment_1283167299892" name="Assign" refToolId="clazz.tool.comment">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Assign" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a NfpRefinement link"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				id="clazz.tool.abstraction_1283167365332" name="NfpRefine"
+				refToolId="clazz.tool.abstraction">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::NfpRefine" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GCM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GCM.Palette.xml
new file mode 100644
index 0000000..c1e661d
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GCM.Palette.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283168643910"
+			name="MARTE/GCM">
+			<aspectTool description="Create a Client Server Specification"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
+				id="clazz.tool.interface_1283169286933" name="ClientServerSpecification"
+				refToolId="clazz.tool.interface">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::GCM::ClientServerSpecification" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Flow Specification"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
+				id="clazz.tool.interface_1283169337014" name="FlowSpecification"
+				refToolId="clazz.tool.interface">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowSpecification" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<separator id="Separator_1283169405747" />
+			<aspectTool description="Create a Client Server Feature Operation"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
+				id="clazz.tool.operation_1283169398624" name="ClientServerFeature Operation"
+				refToolId="clazz.tool.operation">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::ClientServerFeature" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create a Client Server Feature Reception"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
+				id="clazz.tool.reception_1283169433459" name="ClientServerFeature Reception"
+				refToolId="clazz.tool.reception">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::ClientServerFeature" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Flow Property"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="clazz.tool.property_1283169470028" name="FlowProperty"
+				refToolId="clazz.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowProperty" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GQAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GQAM.Palette.xml
new file mode 100644
index 0000000..1bd6088
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GQAM.Palette.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283172757213"
+			name="MARTE/GQAM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172805236" name="GaAnalysisContext (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
+				id="clazz.tool.package_1283172824295" name="GaAnalysisContext (Package)"
+				refToolId="clazz.tool.package">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172880941" name="GaResourcesPlatform (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaResourcesPlatform" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172946437" name="GaExecHost (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaExecHost" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172955656" name="GaCommHost (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommHost" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				id="clazz.tool.association_1283172966218" name="GaCommChannel (Association)"
+				refToolId="clazz.tool.association">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommChannel" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
+				id="clazz.tool.package_1283172998185" name="GaWorkloadBehavior (Package)"
+				refToolId="clazz.tool.package">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadBehavior" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GRM.Palette.xml
new file mode 100644
index 0000000..1a52a6a
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-GRM.Palette.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283167855165"
+			name="MARTE/GRM">
+			<aspectTool description="Create a Communication Media"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				id="clazz.tool.association_1283168032244" name="CommunicationMedia"
+				refToolId="clazz.tool.association">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::CommunicationMedia" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Computing Resource"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168061634" name="ComputingResource"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ComputingResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Scheduler"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168129306" name="Scheduler" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::Scheduler" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Storage Resource"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168151697" name="StorageResource"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::StorageResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Synchronization Resource"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168175290" name="SynchronizationResource"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_Foundations::GRM::SynchronizationResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a TimerResource"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168209397" name="TimerResource" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::TimerResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Timing Resource"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168274356" name="TimingResource" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::TimingResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Schedulable Resource"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168314602" name="SchedulableResource"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::SchedulableResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Processing Resource"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168358064" name="ProcessingResource"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ProcessingResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Concurrency Resource"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283168405086" name="ConcurrencyResource"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ConcurrencyResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HLAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HLAM.Palette.xml
new file mode 100644
index 0000000..26eedda
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HLAM.Palette.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283170106644"
+			name="MARTE/HLAM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170147994" name="PpUnit (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::PpUnit" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170156102" name="RtUnit (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtUnit" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				id="clazz.tool.comment_1283170190141" name="RtSpecification (Comment)"
+				refToolId="clazz.tool.comment">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtSpecification" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<separator id="Separator_1283170202872" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
+				id="clazz.tool.operation_1283170200217" name="RtFeature (Operation)"
+				refToolId="clazz.tool.operation">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtFeature" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
+				id="clazz.tool.operation_1283170214213" name="RtService (Operation)"
+				refToolId="clazz.tool.operation">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtService" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HRM.Palette.xml
new file mode 100644
index 0000000..5965e49
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-HRM.Palette.xml
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283170238426"
+			name="MARTE/HRM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170312022" name="HwASIC (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwASIC" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170319389" name="HwBranchPredictor (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwBranchPredictor" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170325973" name="HwComputingResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwComputingResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170330634" name="HwISA (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwISA" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170334685" name="HwPLD (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwPLD" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170340143" name="HwProcessor (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwProcessor" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283170364620" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283170355095" name="HwArbiter (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwArbiter" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				id="clazz.tool.association_1283170383013" name="HwBridge (Association)"
+				refToolId="clazz.tool.association">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwBridge" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				id="clazz.tool.association_1283170388956" name="HwBus (Association)"
+				refToolId="clazz.tool.association">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwBus" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				id="clazz.tool.association_1283170397480" name="HwCommunicationResource (Association)"
+				refToolId="clazz.tool.association">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwCommunicationResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				id="clazz.tool.association_1283170409085" name="HwMedia (Association)"
+				refToolId="clazz.tool.association">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwMedia" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283325927598" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283325924504" name="HwClock (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwClock" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283325956347" name="HwTimer (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwTimer" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283325981191" name="HwTimingResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwTimingResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283326117205" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326075846" name="HWActuator (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HWActuator" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326081111" name="HWSensor (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HWSensor" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326092127" name="HwDevice (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwDevice" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326098970" name="HwI_O (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwI_O" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326106658" name="HwSupport (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwSupport" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283326140767" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326134345" name="HwCache (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwCache" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326147392" name="HwDrive (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwDrive" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326152048" name="HwMemory (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwMemory" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326157173" name="HwRAM (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwRAM" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326161845" name="HwROM (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwROM" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283326201344" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326172313" name="HwDMA (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwDMA" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326178798" name="HwMMU (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwMMU" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326190157" name="HwStorageManager (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwStorageManager" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283326231000" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326220953" name="HwComponent (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwLayout::HwComponent" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283326249797" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326241406" name="HwCoolingSupply (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwPower::HwCoolingSupply" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326246906" name="HwPowerSupply (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwPower::HwPowerSupply" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283326275531" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283326264906" name="HwResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwGeneral::HwResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
+				id="clazz.tool.operation_1283326271937" name="HwResourceService (Operation)"
+				refToolId="clazz.tool.operation">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwGeneral::HwResourceService" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-NFPs.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-NFPs.Palette.xml
new file mode 100644
index 0000000..f33d2a3
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-NFPs.Palette.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1282925702906"
+			name="MARTE/NFPs">
+			<aspectTool description="Create a Dimension"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
+				id="clazz.tool.enumeration_1282925816870" name="Dimension"
+				refToolId="clazz.tool.enumeration">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::Dimension" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a NFP Property"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="clazz.tool.property_1282926032253" name="Nfp" refToolId="clazz.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::Nfp" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a NFP Constraint"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="clazz.tool.constraint_1282926036565" name="NfpConstraint"
+				refToolId="clazz.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpConstraint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a NFP Data Type"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"
+				id="clazz.tool.datatype_1282926044549" name="NfpDataType" refToolId="clazz.tool.datatype">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpType" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a NFP Primitive Type"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"
+				id="clazz.tool.primitivetype_1282926067876" name="NfpPrimitiveType"
+				refToolId="clazz.tool.primitivetype">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpType" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Unit Enum Literal"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"
+				id="clazz.tool.enumerationliteral_1282926070345" name="Unit"
+				refToolId="clazz.tool.enumerationliteral">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::Unit" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a NFP Enumeration Type"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
+				id="clazz.tool.enumeration_1282926105844" name="NfpEnumerationType"
+				refToolId="clazz.tool.enumeration">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpType" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-PAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-PAM.Palette.xml
new file mode 100644
index 0000000..518e38d
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-PAM.Palette.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283173208097"
+			name="MARTE/PAM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283173244706" name="PaLogicalResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaLogicalResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"
+				id="clazz.tool.instancespecification_1283173265284" name="PaRunTInstance (InstanceSpecification)"
+				refToolId="clazz.tool.instancespecification">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRunTInstance" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SAM.Palette.xml
new file mode 100644
index 0000000..ec637bf
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SAM.Palette.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283173005934"
+			name="MARTE/SAM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283173182128" name="SaCommHost (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommHost" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283173192363" name="SaExecHost (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaExecHost" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283173199300" name="SaSharedResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaSharedResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283173360204" name="SaAnalysisContext (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaAnalysisContext" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SRM.Palette.xml
new file mode 100644
index 0000000..1a6a2e6
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-SRM.Palette.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283172503892"
+			name="MARTE/SRM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172544106" name="SwResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_ResourceCore::SwResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283172558865" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172557162" name="Alarm (Class)" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::Alarm" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172574544" name="InterruptResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::InterruptResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172584258" name="MemoryPartition (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::MemoryPartition" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172591288" name="SwConcurrentResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwConcurrentResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172600630" name="SwSchedulableResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwSchedulableResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172607817" name="SwTimerResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwTimerResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283172626188" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172624470" name="DeviceBroker (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Brokering::DeviceBroker" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172633718" name="MemoryBroker (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Brokering::MemoryBroker" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1283172647107" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172644857" name="MessageComResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::MessageComResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172653074" name="NotificationResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::NotificationResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172668400" name="SharedDataComResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SharedDataComResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				id="clazz.tool.association_1283172675008" name="SwCommunicationResource (Association)"
+				refToolId="clazz.tool.association">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwCommunicationResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172684335" name="SwInteractionResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwInteractionResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172690396" name="SwMutualExclusionResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwMutualExclusionResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283172698488" name="SwSynchronizationResource (Class)"
+				refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwSynchronizationResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Time.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Time.Palette.xml
new file mode 100644
index 0000000..2019347
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/ClassDiag-Time.Palette.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1283167469067"
+			name="MARTE/Time">
+			<aspectTool description="Create a Clock"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"
+				id="clazz.tool.instancespecification_1283167543240" name="Clock"
+				refToolId="clazz.tool.instancespecification">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::Clock" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Clock Constraint"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="clazz.tool.constraint_1283167588460" name="ClockConstraint"
+				refToolId="clazz.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::ClockConstraint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Clock Type"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="clazz.tool.class_1283167610366" name="ClockType" refToolId="clazz.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::ClockType" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create a Timed Constraint"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="clazz.tool.constraint_1283167658085" name="TimedConstraint"
+				refToolId="clazz.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedConstraint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Alloc.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Alloc.Palette.xml
new file mode 100644
index 0000000..15db588
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Alloc.Palette.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286291841888"
+			name="MARTE/Alloc">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291892433" name="Allocated (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Allocated" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				id="composite.tool.abstraction_1286291909588" name="Allocate (Abstraction)"
+				refToolId="composite.tool.abstraction">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Allocate" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				id="composite.tool.abstraction_1286291919541" name="NfpRefine (Abstraction)"
+				refToolId="composite.tool.abstraction">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::NfpRefine" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				id="composite.tool.comment_1286291925775" name="Assign (Comment)"
+				refToolId="composite.tool.comment">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Assign" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-CoreElements.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-CoreElements.Palette.xml
new file mode 100644
index 0000000..f31fada
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-CoreElements.Palette.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286291973383"
+			name="MARTE/CoreElements">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1286292012662" name="Configuration (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_Foundations::CoreElements::Configuration" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"
+				id="composite.tool.statemachine_1286292028740" name="ModeBehavior (StateMachine)"
+				refToolId="composite.tool.statemachine">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::ModeBehavior" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GCM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GCM.Palette.xml
new file mode 100644
index 0000000..9fc4f2d
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GCM.Palette.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1284541192854"
+			name="MARTE/GCM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				id="composite.tool.port_1284541248483" name="ClientServerPort (Port)"
+				refToolId="composite.tool.port">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::ClientServerPort">
+							<runtimeProperty
+								propertyName="MARTE::MARTE_DesignModel::GCM::ClientServerPort::specificationKind" />
+						</stereotype>
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="IconStereotype" displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				id="composite.tool.port_1284541254860" name="IN FlowPort (Port)"
+				refToolId="composite.tool.port">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowPort">
+							<property propertyName="MARTE::MARTE_DesignModel::GCM::FlowPort::direction">
+								<value>in</value>
+							</property>
+						</stereotype>
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="IconStereotype" displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				id="composite.tool.port_1284541375916" name="OUT FlowPort (Port)"
+				refToolId="composite.tool.port">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowPort">
+							<property propertyName="MARTE::MARTE_DesignModel::GCM::FlowPort::direction">
+								<value>out</value>
+							</property>
+						</stereotype>
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="IconStereotype" displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				id="composite.tool.port_1284541412827" name="INOUT FlowPort (Port)"
+				refToolId="composite.tool.port">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowPort" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="IconStereotype" displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				id="composite.tool.port_1286291001282" name="DataPool (Port)"
+				refToolId="composite.tool.port">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::DataPool" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<separator id="Separator_1286291061607" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
+				id="composite.tool.activity_1286291058982" name="GCMInvocatingBehavior (Activity)"
+				refToolId="composite.tool.activity">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocatingBehavior" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"
+				id="composite.tool.statemachine_1286291072044" name="GCMInvocatingBehavior (StateMachine)"
+				refToolId="composite.tool.statemachine">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocatingBehavior" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GQAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GQAM.Palette.xml
new file mode 100644
index 0000000..ab8db8c
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GQAM.Palette.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286293660583"
+			name="MARTE/GQAM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1286293768657" name="GaAnalysisContext (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293789797" name="GaCommChannel (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommChannel" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293802578" name="GaCommHost (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommHost" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293821499" name="GaCommStep (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommStep" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293838405" name="GaEventTrace (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaEventTrace" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293847701" name="GaExecHost (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaExecHost" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1286293884309" name="GaScenario (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaScenario" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293903777" name="GaStep (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaStep" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1286293920948" name="GaWorkloadBehavior (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadBehavior" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
+				id="composite.tool.activity_1286293942088" name="GaWorkloadGenerator (Activity)"
+				refToolId="composite.tool.activity">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadGenerator" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293960134" name="GaWorkloadEvent (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadEvent" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="composite.tool.constraint_1286293970353" name="GaLatencyObs (Constraint)"
+				refToolId="composite.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaLatencyObs" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="composite.tool.constraint_1286293979509" name="GaTimedObs (Constraint)"
+				refToolId="composite.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaTimedObs" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GRM.Palette.xml
new file mode 100644
index 0000000..c7d7668
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-GRM.Palette.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286291456824"
+			name="MARTE/GRM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				id="composite.tool.port_1286291577992" name="CommunicationEndPoint (Port)"
+				refToolId="composite.tool.port">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::CommunicationEndPoint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291613974" name="ComputingResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ComputingResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291633724" name="ConcurrencyResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ConcurrencyResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291643817" name="DeviceResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::DeviceResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291657817" name="MutualExclusionResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_Foundations::GRM::MutualExclusionResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291665348" name="ProcessingResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ProcessingResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291680066" name="Resource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::Resource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291706127" name="SchedulableResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::SchedulableResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291713799" name="Scheduler (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::Scheduler" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291724689" name="SecondaryScheduler (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::SecondaryScheduler" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291743938" name="ClockResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ClockResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291757203" name="StorageResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::StorageResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291765703" name="SynchronizationResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_Foundations::GRM::SynchronizationResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291775093" name="TimerResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::TimerResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291782437" name="TimingResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::TimingResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
+				id="composite.tool.connector_1286291803639" name="CommunicationMedia (Connector)"
+				refToolId="composite.tool.connector">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::CommunicationMedia" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				id="composite.tool.dependency_1286291815889" name="ResourceUsage (Dependency)"
+				refToolId="composite.tool.dependency">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ResourceUsage" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HLAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HLAM.Palette.xml
new file mode 100644
index 0000000..7202d26
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HLAM.Palette.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1284541659174"
+			name="MARTE/HLAM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1284541705115" name="RtUnit (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtUnit" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1284541713194" name="PpUnit (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::PpUnit" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				id="composite.tool.comment_1284541723757" name="RtSpecification (Comment)"
+				refToolId="composite.tool.comment">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtSpecification" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				id="composite.tool.port_1284541741789" name="RtFeature (Port)"
+				refToolId="composite.tool.port">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtFeature" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HRM.Palette.xml
new file mode 100644
index 0000000..351e3fb
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-HRM.Palette.xml
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286292080097"
+			name="MARTE/HRM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292572313" name="HwASIC (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwASIC" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292584687" name="HwBranchPredictor (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwBranchPredictor" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292603327" name="HwComputingResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwComputingResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292623170" name="HwISA (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwISA" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292631357" name="HwPLD (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwPLD" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292640919" name="HwProcessor (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwProcessor" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286292673621" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292671043" name="HwArbiter (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwArbiter" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292687886" name="HwBridge (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwBridge" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292701808" name="HwBus (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwBus" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292735041" name="HwCommunicationResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwCommunicationResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				id="composite.tool.port_1286292744806" name="HwEndPoint (Port)"
+				refToolId="composite.tool.port">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwEndPoint" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292755196" name="HwMedia (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwMedia" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286292778508" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292776086" name="HwClock (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwClock" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292790132" name="HwTimer (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwTimer" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292799960" name="HwTimingResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwTimingResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286292817569" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292815178" name="HWActuator (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HWActuator" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292830209" name="HWSensor (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HWSensor" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292840334" name="HwDevice (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwDevice" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292850552" name="HwI_O (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwI_O" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292861114" name="HwSupport (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwSupport" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286292880191" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292876848" name="HwCache (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwCache" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292892129" name="HwDrive (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwDrive" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292900847" name="HwMemory (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwMemory" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292909362" name="HwRAM (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwRAM" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292919331" name="HwROM (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwROM" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286292947830" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292940252" name="HwDMA (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwDMA" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292981031" name="HwMMU (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwMMU" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286292990531" name="HwStorageManager (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwStorageManager" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286293042060" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1286293020702" name="HwComponent (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwLayout::HwComponent" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="HorizontalStereo" displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286293044404" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293034217" name="HwCoolingSupply (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwPower::HwCoolingSupply" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293061794" name="HwPowerSupply (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwPower::HwPowerSupply" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286293100417" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293079137" name="HwResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwGeneral::HwResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
+				id="composite.tool.activity_1286293096355" name="HwResourceService (Activity)"
+				refToolId="composite.tool.activity">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::HRM::HwGeneral::HwResourceService" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-NFPs.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-NFPs.Palette.xml
new file mode 100644
index 0000000..3e0940f
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-NFPs.Palette.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286291326470"
+			name="MARTE/NFPs">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="composite.tool.constraint_1286291403061" name="NfpConstraint (Constraint)"
+				refToolId="composite.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpConstraint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-PAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-PAM.Palette.xml
new file mode 100644
index 0000000..27056dd
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-PAM.Palette.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286294128409"
+			name="MARTE/PAM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
+				id="composite.tool.connector_1286294162892" name="PaCommStep (Connector)"
+				refToolId="composite.tool.connector">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaCommStep" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286294174954" name="PaLogicalResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaLogicalResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286294186594" name="PaRequestedStep (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRequestedStep" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286295580751" name="PaStep (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaStep" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SAM.Palette.xml
new file mode 100644
index 0000000..593cc94
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SAM.Palette.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286293984555"
+			name="MARTE/SAM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1286294019757" name="SaAnalysisContext (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaAnalysisContext" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286294034772" name="SaCommHost (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommHost" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
+				id="composite.tool.connector_1286294062005" name="SaCommStep (Connector)"
+				refToolId="composite.tool.connector">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommStep" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
+				id="composite.tool.activity_1286294076927" name="SaEndtoEndFlow (Activity)"
+				refToolId="composite.tool.activity">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaEndtoEndFlow" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286294087255" name="SaExecHost (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaExecHost" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286294098801" name="SaSharedResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaSharedResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286294115519" name="SaStep (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaStep" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="composite.tool.constraint_1286294119863" name="SaSchedObs (Constraint)"
+				refToolId="composite.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaSchedObs" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SRM.Palette.xml
new file mode 100644
index 0000000..229572c
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-SRM.Palette.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286293279020"
+			name="MARTE/SRM">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
+				id="composite.tool.activity_1286293332502" name="SwAccessService (Activity)"
+				refToolId="composite.tool.activity">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_ResourceCore::SwAccessService" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293347564" name="SwResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_ResourceCore::SwResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286293396890" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293395297" name="Alarm (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::Alarm" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293414999" name="InterruptResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::InterruptResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293430498" name="MemoryPartition (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::MemoryPartition" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293444451" name="SwConcurrentResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwConcurrentResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293459497" name="SwSchedulableResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwSchedulableResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293479090" name="SwTimerResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwTimerResource" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				id="composite.tool.abstraction_1286293488059" name="EntryPoint (Abstraction)"
+				refToolId="composite.tool.abstraction">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::EntryPoint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<separator id="Separator_1286293501027" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293498730" name="DeviceBroker (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Brokering::DeviceBroker" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293518651" name="MemoryBroker (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Brokering::MemoryBroker" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<separator id="Separator_1286293547010" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
+				id="composite.tool.connector_1286293544728" name="MessageComResource (Connector)"
+				refToolId="composite.tool.connector">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::MessageComResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293556791" name="NotificationResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::NotificationResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293569134" name="SharedDataComResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SharedDataComResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293579399" name="SwCommunicationResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwCommunicationResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293612820" name="SwInteractionResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwInteractionResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293622163" name="SwMutualExclusionResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwMutualExclusionResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286293641787" name="SwSynchronizationResource (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwSynchronizationResource" />
+					</stereotypesToApply>
+				</postAction>
+				<postAction displayKind="TextIconStereotype"
+					displayPlace="Compartment"
+					id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider" />
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Time.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Time.Palette.xml
new file mode 100644
index 0000000..cee25a0
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/palettes/CompositeDiag-Time.Palette.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+	<content>
+		<drawer iconpath="/icons/drawer.gif" id="Drawer__1286291144244"
+			name="MARTE/Time">
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				id="composite.tool.property_1286291192820" name="Clock (Property)"
+				refToolId="composite.tool.property">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::Clock" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1286291207835" name="ClockType (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::ClockType" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				id="composite.tool.class_1286291233427" name="TimedDomain (Class)"
+				refToolId="composite.tool.class">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedDomain" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
+				id="composite.tool.activity_1286291259582" name="TimedProcessing (Activity)"
+				refToolId="composite.tool.activity">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedProcessing" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<separator id="Separator_1286291271238" />
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="composite.tool.constraint_1286291268629" name="ClockConstraint (Constraint)"
+				refToolId="composite.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::ClockConstraint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				id="composite.tool.constraint_1286291275050" name="TimedConstraint (Constraint)"
+				refToolId="composite.tool.constraint">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedConstraint" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+				id="composite.tool.durationobservation_1286291278785" name="TimedDurationObservation (DurationObservation)"
+				refToolId="composite.tool.durationobservation">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_Foundations::Time::TimedDurationObservation" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+			<aspectTool description="Create an element with a stereotype"
+				iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+				id="composite.tool.timeobservation_1286291281784" name="TimedInstantObservation (TimeObservation)"
+				refToolId="composite.tool.timeobservation">
+				<postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
+					<stereotypesToApply>
+						<stereotype
+							stereotypeName="MARTE::MARTE_Foundations::Time::TimedInstantObservation" />
+					</stereotypesToApply>
+				</postAction>
+			</aspectTool>
+		</drawer>
+	</content>
+</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.properties b/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.properties
new file mode 100644
index 0000000..44b8ee3
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Chokri MRAIDHA  chokri.mraidha@cea.fr - Initial API and implementation
+##################################################################################
+pluginName = UML profile and library for MARTE (Incubation)
+providerName = Eclipse Modeling Project
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml
new file mode 100644
index 0000000..f429972
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/plugin.xml
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-NFPs-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-NFPs-Palette"
+            path="/palettes/ClassDiag-NFPs.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-Alloc-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-Alloc-Palette"
+            path="/palettes/ClassDiag-Alloc.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-Time-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-Time-Palette"
+            path="/palettes/ClassDiag-Time.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-GRM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-GRM-Palette"
+            path="/palettes/ClassDiag-GRM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-GCM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-GCM-Palette"
+            path="/palettes/ClassDiag-GCM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-HLAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-HLAM-Palette"
+            path="/palettes/ClassDiag-HLAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-HRM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-HRM-Palette"
+            path="/palettes/ClassDiag-HRM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-SRM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-SRM-Palette"
+            path="/palettes/ClassDiag-SRM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ClassDiagram-GQAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ClassDiagram-GQAM-Palette"
+            path="/palettes/ClassDiag-GQAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.clazz">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ActivityDiagram-GCM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ActivityDiagram-GCM-Palette"
+            path="/palettes/ActivityDiag-GCM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.activity">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ActivityDiagram-HLAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ActivityDiagram-HLAM-Palette"
+            path="/palettes/ActivityDiag-HLAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.activity"></editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ActivityDiagram-GQAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ActivityDiagram-GQAM-Palette"
+            path="/palettes/ActivityDiag-GQAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.activity"></editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ActivityDiagram-NFPs-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ActivityDiagram-NFPs-Palette"
+            path="/palettes/ActivityDiag-NFPs.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.activity">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ActivityDiagram-PAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ActivityDiagram-PAM-Palette"
+            path="/palettes/ActivityDiag-PAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.activity">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ActivityDiagram-SAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ActivityDiagram-SAM-Palette"
+            path="/palettes/ActivityDiag-SAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.activity">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="ActivityDiagram-Time-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="ActivityDiagram-Time-Palette"
+            path="/palettes/ActivityDiag-Time.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.activity">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-Alloc-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-Alloc-Palette"
+            path="/palettes/CompositeDiag-Alloc.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-CoreElements-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-CoreElements-Palette"
+            path="/palettes/CompositeDiag-CoreElements.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-GCM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-GCM-Palette"
+            path="/palettes/CompositeDiag-GCM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-GRM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-GRM-Palette"
+            path="/palettes/CompositeDiag-GRM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-HLAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-HLAM-Palette"
+            path="/palettes/CompositeDiag-HLAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-HRM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-HRM-Palette"
+            path="/palettes/CompositeDiag-HRM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-NFPs-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-NFPs-Palette"
+            path="/palettes/CompositeDiag-NFPs.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-PAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-PAM-Palette"
+            path="/palettes/CompositeDiag-PAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-SAM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-SAM-Palette"
+            path="/palettes/CompositeDiag-SAM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-SRM-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-SRM-Palette"
+            path="/palettes/CompositeDiag-SRM.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="CompositeDiagram-Time-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="CompositeDiagram-Time-Palette"
+            path="/palettes/CompositeDiag-Time.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.composite">
+         </editor>
+      </paletteDefinition>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+      <paletteDefinition
+            ID="StateMachineDiagram-CoreElements-Palette"
+            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+            icon="platform:/plugin/org.eclipse.papyrus.marte.static.profile/resources/icons/MARTE_16x16.gif"
+            name="StateMachineDiagram-CoreElements-Palette"
+            path="/palettes/StateMachineDiag-CoreElements.Palette.xml">
+         <Priority
+               name="Highest">
+         </Priority>
+         <editor
+               id="org.eclipse.papyrus.uml.diagram.statemachine">
+         </editor>
+      </paletteDefinition>
+   </extension>
+
+</plugin>
diff --git a/core/org.eclipse.papyrus.marte.static.profile.ui/pom.xml b/core/org.eclipse.papyrus.marte.static.profile.ui/pom.xml
new file mode 100644
index 0000000..6fa3582
--- /dev/null
+++ b/core/org.eclipse.papyrus.marte.static.profile.ui/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.marte</groupId>
+		<artifactId>org.eclipse.papyrus.marte.core</artifactId>
+		<version>1.2.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.marte.static.profile.ui</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<description>This module contains the UML profile for MARTE (Modeling and Analysis of Real-Time Embedded systems)</description>
+</project>
diff --git a/core/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF
index 5a5c025..0558aaf 100644
--- a/core/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.marte.static.profile/META-INF/MANIFEST.MF
@@ -118,8 +118,7 @@
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="3.1.0",
  org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/core/org.eclipse.papyrus.marte.static.profile/build.properties b/core/org.eclipse.papyrus.marte.static.profile/build.properties
index be220ba..c2b36aa 100644
--- a/core/org.eclipse.papyrus.marte.static.profile/build.properties
+++ b/core/org.eclipse.papyrus.marte.static.profile/build.properties
@@ -3,7 +3,6 @@
                resources/,\
                plugin.properties,\
                .,\
-               palettes/,\
                about.html
 src.includes = about.html
 source.. = src/,src-gen/
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GCM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GCM.Palette.xml
deleted file mode 100644
index 9a1dea3..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-GCM.Palette.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<paletteDefinition>
-  <content>
-    <drawer iconpath="/icons/drawer.gif" id="Drawer__1283327086671" name="MARTE/GCM">
-      <aspectTool description="Create an element with a stereotype"
-                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
-                  id="createCallBehaviorAction2CreationTool_1283327647999" name="GCMInvocationAction (Call Behavior Action)"
-                  refToolId="activity.nodes.invocationactionsgroup.callbehavioraction">
-        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-          <stereotypesToApply>
-            <stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocationAction"/>
-          </stereotypesToApply>
-        </postAction>
-      </aspectTool>
-      <aspectTool description="Create an element with a stereotype"
-                  iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
-                  id="createCallOperationAction12CreationTool_1283327660625" name="GCMInvocationAction (Call Operation Action)"
-                  refToolId="activity.nodes.invocationactionsgroup.calloperationaction">
-        <postAction id="org.eclipse.papyrus.applystereotypeactionprovider">
-          <stereotypesToApply>
-            <stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocationAction"/>
-          </stereotypesToApply>
-        </postAction>
-      </aspectTool>
-    </drawer>
-  </content>
-</paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-NFPs.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-NFPs.Palette.xml
deleted file mode 100644
index 03d914e..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-NFPs.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283326405607" name="MARTE/NFPs"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="createLocalPreconditionConstraint1CreationTool_1283326588152" name="NfpConstraint" refToolId="createLocalPreconditionConstraint31CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpConstraint"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SRM.Palette.xml
deleted file mode 100644
index e48c154..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ActivityDiag-SRM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283327834664" name="MARTE/SRM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif" id="createStructuredActivityNode3CreationTool_1283327876487" name="MemoryPartition (Structured Activity Node)" refToolId="createStructuredActivityNode3CreationTool"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::MemoryPartition"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-Alloc.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-Alloc.Palette.xml
deleted file mode 100644
index 35bcea1..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-Alloc.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283167207545" name="MARTE/Alloc"><aspectTool description="Create an Allocate link" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" id="clazz.tool.abstraction_1283167259234" name="Allocate" refToolId="clazz.tool.abstraction"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Allocate"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an Assign element" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif" id="clazz.tool.comment_1283167299892" name="Assign" refToolId="clazz.tool.comment"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Assign"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a NfpRefinement link" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" id="clazz.tool.abstraction_1283167365332" name="NfpRefine" refToolId="clazz.tool.abstraction"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::NfpRefine"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GCM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GCM.Palette.xml
deleted file mode 100644
index 40a16d7..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GCM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283168643910" name="MARTE/GCM"><aspectTool description="Create a Client Server Specification" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif" id="clazz.tool.interface_1283169286933" name="ClientServerSpecification" refToolId="clazz.tool.interface"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::ClientServerSpecification"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Flow Specification" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif" id="clazz.tool.interface_1283169337014" name="FlowSpecification" refToolId="clazz.tool.interface"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowSpecification"/></stereotypesToApply></postAction></aspectTool><separator id="Separator_1283169405747"/><aspectTool description="Create a Client Server Feature Operation" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif" id="clazz.tool.operation_1283169398624" name="ClientServerFeature Operation" refToolId="clazz.tool.operation"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::ClientServerFeature"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create a Client Server Feature Reception" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif" id="clazz.tool.reception_1283169433459" name="ClientServerFeature Reception" refToolId="clazz.tool.reception"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::ClientServerFeature"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Flow Property" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="clazz.tool.property_1283169470028" name="FlowProperty" refToolId="clazz.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowProperty"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GQAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GQAM.Palette.xml
deleted file mode 100644
index 6fcf4ce..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GQAM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283172757213" name="MARTE/GQAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172805236" name="GaAnalysisContext (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif" id="clazz.tool.package_1283172824295" name="GaAnalysisContext (Package)" refToolId="clazz.tool.package"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172880941" name="GaResourcesPlatform (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaResourcesPlatform"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172946437" name="GaExecHost (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaExecHost"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172955656" name="GaCommHost (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommHost"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" id="clazz.tool.association_1283172966218" name="GaCommChannel (Association)" refToolId="clazz.tool.association"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommChannel"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif" id="clazz.tool.package_1283172998185" name="GaWorkloadBehavior (Package)" refToolId="clazz.tool.package"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadBehavior"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GRM.Palette.xml
deleted file mode 100644
index 43502e2..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-GRM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283167855165" name="MARTE/GRM"><aspectTool description="Create a Communication Media" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" id="clazz.tool.association_1283168032244" name="CommunicationMedia" refToolId="clazz.tool.association"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::CommunicationMedia"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Computing Resource" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168061634" name="ComputingResource" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ComputingResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Scheduler" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168129306" name="Scheduler" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::Scheduler"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Storage Resource" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168151697" name="StorageResource" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::StorageResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Synchronization Resource" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168175290" name="SynchronizationResource" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::SynchronizationResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a TimerResource" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168209397" name="TimerResource" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::TimerResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Timing Resource" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168274356" name="TimingResource" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::TimingResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Schedulable Resource" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168314602" name="SchedulableResource" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::SchedulableResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Processing Resource" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168358064" name="ProcessingResource" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ProcessingResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Concurrency Resource" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283168405086" name="ConcurrencyResource" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ConcurrencyResource"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-HLAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-HLAM.Palette.xml
deleted file mode 100644
index 19f35a5..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-HLAM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283170106644" name="MARTE/HLAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170147994" name="PpUnit (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::PpUnit"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170156102" name="RtUnit (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtUnit"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif" id="clazz.tool.comment_1283170190141" name="RtSpecification (Comment)" refToolId="clazz.tool.comment"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtSpecification"/></stereotypesToApply></postAction></aspectTool><separator id="Separator_1283170202872"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif" id="clazz.tool.operation_1283170200217" name="RtFeature (Operation)" refToolId="clazz.tool.operation"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtFeature"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif" id="clazz.tool.operation_1283170214213" name="RtService (Operation)" refToolId="clazz.tool.operation"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtService"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-HRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-HRM.Palette.xml
deleted file mode 100644
index f4fd365..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-HRM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283170238426" name="MARTE/HRM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170312022" name="HwASIC (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwASIC"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170319389" name="HwBranchPredictor (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwBranchPredictor"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170325973" name="HwComputingResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwComputingResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170330634" name="HwISA (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwISA"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170334685" name="HwPLD (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwPLD"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170340143" name="HwProcessor (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwProcessor"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283170364620"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283170355095" name="HwArbiter (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwArbiter"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" id="clazz.tool.association_1283170383013" name="HwBridge (Association)" refToolId="clazz.tool.association"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwBridge"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" id="clazz.tool.association_1283170388956" name="HwBus (Association)" refToolId="clazz.tool.association"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwBus"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" id="clazz.tool.association_1283170397480" name="HwCommunicationResource (Association)" refToolId="clazz.tool.association"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwCommunicationResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" id="clazz.tool.association_1283170409085" name="HwMedia (Association)" refToolId="clazz.tool.association"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwMedia"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283325927598"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283325924504" name="HwClock (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwClock"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283325956347" name="HwTimer (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwTimer"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283325981191" name="HwTimingResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwTimingResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283326117205"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326075846" name="HWActuator (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HWActuator"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326081111" name="HWSensor (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HWSensor"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326092127" name="HwDevice (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwDevice"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326098970" name="HwI_O (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwI_O"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326106658" name="HwSupport (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwSupport"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283326140767"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326134345" name="HwCache (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwCache"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326147392" name="HwDrive (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwDrive"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326152048" name="HwMemory (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwMemory"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326157173" name="HwRAM (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwRAM"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326161845" name="HwROM (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwROM"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283326201344"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326172313" name="HwDMA (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwDMA"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326178798" name="HwMMU (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwMMU"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326190157" name="HwStorageManager (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwStorageManager"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283326231000"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326220953" name="HwComponent (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwLayout::HwComponent"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283326249797"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326241406" name="HwCoolingSupply (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwPower::HwCoolingSupply"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326246906" name="HwPowerSupply (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwPower::HwPowerSupply"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283326275531"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283326264906" name="HwResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwGeneral::HwResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif" id="clazz.tool.operation_1283326271937" name="HwResourceService (Operation)" refToolId="clazz.tool.operation"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwGeneral::HwResourceService"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-NFPs.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-NFPs.Palette.xml
deleted file mode 100644
index 3abed88..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-NFPs.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1282925702906" name="MARTE/NFPs"><aspectTool description="Create a Dimension" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif" id="clazz.tool.enumeration_1282925816870" name="Dimension" refToolId="clazz.tool.enumeration"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::Dimension"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a NFP Property" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="clazz.tool.property_1282926032253" name="Nfp" refToolId="clazz.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::Nfp"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a NFP Constraint" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="clazz.tool.constraint_1282926036565" name="NfpConstraint" refToolId="clazz.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpConstraint"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a NFP Data Type" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif" id="clazz.tool.datatype_1282926044549" name="NfpDataType" refToolId="clazz.tool.datatype"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpType"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a NFP Primitive Type" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif" id="clazz.tool.primitivetype_1282926067876" name="NfpPrimitiveType" refToolId="clazz.tool.primitivetype"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpType"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Unit Enum Literal" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif" id="clazz.tool.enumerationliteral_1282926070345" name="Unit" refToolId="clazz.tool.enumerationliteral"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::Unit"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a NFP Enumeration Type" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif" id="clazz.tool.enumeration_1282926105844" name="NfpEnumerationType" refToolId="clazz.tool.enumeration"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpType"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-PAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-PAM.Palette.xml
deleted file mode 100644
index 489e0b9..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-PAM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283173208097" name="MARTE/PAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283173244706" name="PaLogicalResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaLogicalResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif" id="clazz.tool.instancespecification_1283173265284" name="PaRunTInstance (InstanceSpecification)" refToolId="clazz.tool.instancespecification"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRunTInstance"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-SAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-SAM.Palette.xml
deleted file mode 100644
index 3ba1d0b..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-SAM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283173005934" name="MARTE/SAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283173182128" name="SaCommHost (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommHost"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283173192363" name="SaExecHost (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaExecHost"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283173199300" name="SaSharedResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaSharedResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283173360204" name="SaAnalysisContext (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaAnalysisContext"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-SRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-SRM.Palette.xml
deleted file mode 100644
index 1379f38..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-SRM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283172503892" name="MARTE/SRM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172544106" name="SwResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_ResourceCore::SwResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283172558865"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172557162" name="Alarm (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::Alarm"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172574544" name="InterruptResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::InterruptResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172584258" name="MemoryPartition (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::MemoryPartition"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172591288" name="SwConcurrentResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwConcurrentResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172600630" name="SwSchedulableResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwSchedulableResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172607817" name="SwTimerResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwTimerResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283172626188"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172624470" name="DeviceBroker (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Brokering::DeviceBroker"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172633718" name="MemoryBroker (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Brokering::MemoryBroker"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1283172647107"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172644857" name="MessageComResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::MessageComResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172653074" name="NotificationResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::NotificationResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172668400" name="SharedDataComResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SharedDataComResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif" id="clazz.tool.association_1283172675008" name="SwCommunicationResource (Association)" refToolId="clazz.tool.association"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwCommunicationResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172684335" name="SwInteractionResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwInteractionResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172690396" name="SwMutualExclusionResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwMutualExclusionResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283172698488" name="SwSynchronizationResource (Class)" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwSynchronizationResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-Time.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-Time.Palette.xml
deleted file mode 100644
index 94b6e93..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/ClassDiag-Time.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1283167469067" name="MARTE/Time"><aspectTool description="Create a Clock" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif" id="clazz.tool.instancespecification_1283167543240" name="Clock" refToolId="clazz.tool.instancespecification"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::Clock"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Clock Constraint" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="clazz.tool.constraint_1283167588460" name="ClockConstraint" refToolId="clazz.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::ClockConstraint"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Clock Type" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="clazz.tool.class_1283167610366" name="ClockType" refToolId="clazz.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::ClockType"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create a Timed Constraint" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="clazz.tool.constraint_1283167658085" name="TimedConstraint" refToolId="clazz.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedConstraint"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-Alloc.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-Alloc.Palette.xml
deleted file mode 100644
index 3035a92..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-Alloc.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286291841888" name="MARTE/Alloc"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291892433" name="Allocated (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Allocated"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" id="composite.tool.abstraction_1286291909588" name="Allocate (Abstraction)" refToolId="composite.tool.abstraction"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Allocate"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" id="composite.tool.abstraction_1286291919541" name="NfpRefine (Abstraction)" refToolId="composite.tool.abstraction"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::NfpRefine"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif" id="composite.tool.comment_1286291925775" name="Assign (Comment)" refToolId="composite.tool.comment"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Alloc::Assign"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-CoreElements.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-CoreElements.Palette.xml
deleted file mode 100644
index 282bf5c..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-CoreElements.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286291973383" name="MARTE/CoreElements"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1286292012662" name="Configuration (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::Configuration"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif" id="composite.tool.statemachine_1286292028740" name="ModeBehavior (StateMachine)" refToolId="composite.tool.statemachine"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::ModeBehavior"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GCM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GCM.Palette.xml
deleted file mode 100644
index fac0150..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GCM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1284541192854" name="MARTE/GCM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" id="composite.tool.port_1284541248483" name="ClientServerPort (Port)" refToolId="composite.tool.port"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::ClientServerPort"><runtimeProperty propertyName="MARTE::MARTE_DesignModel::GCM::ClientServerPort::specificationKind"/></stereotype></stereotypesToApply></postAction><postAction displayKind="IconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" id="composite.tool.port_1284541254860" name="IN FlowPort (Port)" refToolId="composite.tool.port"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowPort"><property propertyName="MARTE::MARTE_DesignModel::GCM::FlowPort::direction"><value>in</value></property></stereotype></stereotypesToApply></postAction><postAction displayKind="IconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" id="composite.tool.port_1284541375916" name="OUT FlowPort (Port)" refToolId="composite.tool.port"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowPort"><property propertyName="MARTE::MARTE_DesignModel::GCM::FlowPort::direction"><value>out</value></property></stereotype></stereotypesToApply></postAction><postAction displayKind="IconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" id="composite.tool.port_1284541412827" name="INOUT FlowPort (Port)" refToolId="composite.tool.port"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::FlowPort"/></stereotypesToApply></postAction><postAction displayKind="IconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" id="composite.tool.port_1286291001282" name="DataPool (Port)" refToolId="composite.tool.port"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::DataPool"/></stereotypesToApply></postAction></aspectTool><separator id="Separator_1286291061607"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" id="composite.tool.activity_1286291058982" name="GCMInvocatingBehavior (Activity)" refToolId="composite.tool.activity"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocatingBehavior"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif" id="composite.tool.statemachine_1286291072044" name="GCMInvocatingBehavior (StateMachine)" refToolId="composite.tool.statemachine"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::GCM::GCMInvocatingBehavior"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GQAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GQAM.Palette.xml
deleted file mode 100644
index b4171c5..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GQAM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286293660583" name="MARTE/GQAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1286293768657" name="GaAnalysisContext (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaAnalysisContext"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293789797" name="GaCommChannel (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommChannel"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293802578" name="GaCommHost (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommHost"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293821499" name="GaCommStep (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293838405" name="GaEventTrace (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaEventTrace"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293847701" name="GaExecHost (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaExecHost"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1286293884309" name="GaScenario (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaScenario"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293903777" name="GaStep (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1286293920948" name="GaWorkloadBehavior (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadBehavior"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" id="composite.tool.activity_1286293942088" name="GaWorkloadGenerator (Activity)" refToolId="composite.tool.activity"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadGenerator"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293960134" name="GaWorkloadEvent (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaWorkloadEvent"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="composite.tool.constraint_1286293970353" name="GaLatencyObs (Constraint)" refToolId="composite.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaLatencyObs"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="composite.tool.constraint_1286293979509" name="GaTimedObs (Constraint)" refToolId="composite.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::GQAM::GaTimedObs"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GRM.Palette.xml
deleted file mode 100644
index 79fd24c..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-GRM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286291456824" name="MARTE/GRM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" id="composite.tool.port_1286291577992" name="CommunicationEndPoint (Port)" refToolId="composite.tool.port"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::CommunicationEndPoint"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291613974" name="ComputingResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ComputingResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291633724" name="ConcurrencyResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ConcurrencyResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291643817" name="DeviceResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::DeviceResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291657817" name="MutualExclusionResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::MutualExclusionResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291665348" name="ProcessingResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ProcessingResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291680066" name="Resource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::Resource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291706127" name="SchedulableResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::SchedulableResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291713799" name="Scheduler (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::Scheduler"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291724689" name="SecondaryScheduler (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::SecondaryScheduler"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291743938" name="ClockResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ClockResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291757203" name="StorageResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::StorageResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291765703" name="SynchronizationResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::SynchronizationResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291775093" name="TimerResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::TimerResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291782437" name="TimingResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::TimingResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif" id="composite.tool.connector_1286291803639" name="CommunicationMedia (Connector)" refToolId="composite.tool.connector"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::CommunicationMedia"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif" id="composite.tool.dependency_1286291815889" name="ResourceUsage (Dependency)" refToolId="composite.tool.dependency"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::GRM::ResourceUsage"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-HLAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-HLAM.Palette.xml
deleted file mode 100644
index 9e17ef5..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-HLAM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1284541659174" name="MARTE/HLAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1284541705115" name="RtUnit (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtUnit"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1284541713194" name="PpUnit (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::PpUnit"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif" id="composite.tool.comment_1284541723757" name="RtSpecification (Comment)" refToolId="composite.tool.comment"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtSpecification"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" id="composite.tool.port_1284541741789" name="RtFeature (Port)" refToolId="composite.tool.port"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HLAM::RtFeature"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-HRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-HRM.Palette.xml
deleted file mode 100644
index a59b4fa..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-HRM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286292080097" name="MARTE/HRM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292572313" name="HwASIC (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwASIC"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292584687" name="HwBranchPredictor (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwBranchPredictor"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292603327" name="HwComputingResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwComputingResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292623170" name="HwISA (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwISA"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292631357" name="HwPLD (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwPLD"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292640919" name="HwProcessor (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwComputing::HwProcessor"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286292673621"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292671043" name="HwArbiter (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwArbiter"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292687886" name="HwBridge (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwBridge"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292701808" name="HwBus (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwBus"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292735041" name="HwCommunicationResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwCommunicationResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" id="composite.tool.port_1286292744806" name="HwEndPoint (Port)" refToolId="composite.tool.port"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwEndPoint"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292755196" name="HwMedia (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwCommunication::HwMedia"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286292778508"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292776086" name="HwClock (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwClock"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292790132" name="HwTimer (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwTimer"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292799960" name="HwTimingResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwTiming::HwTimingResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286292817569"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292815178" name="HWActuator (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HWActuator"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292830209" name="HWSensor (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HWSensor"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292840334" name="HwDevice (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwDevice"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292850552" name="HwI_O (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwI_O"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292861114" name="HwSupport (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwDevice::HwSupport"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286292880191"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292876848" name="HwCache (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwCache"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292892129" name="HwDrive (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwDrive"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292900847" name="HwMemory (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwMemory"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292909362" name="HwRAM (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwRAM"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292919331" name="HwROM (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwMemory::HwROM"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286292947830"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292940252" name="HwDMA (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwDMA"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292981031" name="HwMMU (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwMMU"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286292990531" name="HwStorageManager (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwLogical::HwStorage::HwStorageManager::HwStorageManager"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286293042060"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1286293020702" name="HwComponent (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwLayout::HwComponent"/></stereotypesToApply></postAction><postAction displayKind="HorizontalStereo" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286293044404"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293034217" name="HwCoolingSupply (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwPower::HwCoolingSupply"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293061794" name="HwPowerSupply (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwPhysical::HwPower::HwPowerSupply"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286293100417"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293079137" name="HwResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwGeneral::HwResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" id="composite.tool.activity_1286293096355" name="HwResourceService (Activity)" refToolId="composite.tool.activity"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::HRM::HwGeneral::HwResourceService"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-NFPs.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-NFPs.Palette.xml
deleted file mode 100644
index bd5650b..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-NFPs.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286291326470" name="MARTE/NFPs"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="composite.tool.constraint_1286291403061" name="NfpConstraint (Constraint)" refToolId="composite.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::NFPs::NfpConstraint"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-PAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-PAM.Palette.xml
deleted file mode 100644
index 1af0236..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-PAM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286294128409" name="MARTE/PAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif" id="composite.tool.connector_1286294162892" name="PaCommStep (Connector)" refToolId="composite.tool.connector"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286294174954" name="PaLogicalResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaLogicalResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286294186594" name="PaRequestedStep (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaRequestedStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286295580751" name="PaStep (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::PAM::PaStep"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-SAM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-SAM.Palette.xml
deleted file mode 100644
index 62bf85e..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-SAM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286293984555" name="MARTE/SAM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1286294019757" name="SaAnalysisContext (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaAnalysisContext"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286294034772" name="SaCommHost (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommHost"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif" id="composite.tool.connector_1286294062005" name="SaCommStep (Connector)" refToolId="composite.tool.connector"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaCommStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" id="composite.tool.activity_1286294076927" name="SaEndtoEndFlow (Activity)" refToolId="composite.tool.activity"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaEndtoEndFlow"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286294087255" name="SaExecHost (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaExecHost"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286294098801" name="SaSharedResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaSharedResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286294115519" name="SaStep (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaStep"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="composite.tool.constraint_1286294119863" name="SaSchedObs (Constraint)" refToolId="composite.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_AnalysisModel::SAM::SaSchedObs"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-SRM.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-SRM.Palette.xml
deleted file mode 100644
index 38302ad..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-SRM.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286293279020" name="MARTE/SRM"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" id="composite.tool.activity_1286293332502" name="SwAccessService (Activity)" refToolId="composite.tool.activity"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_ResourceCore::SwAccessService"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293347564" name="SwResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_ResourceCore::SwResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286293396890"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293395297" name="Alarm (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::Alarm"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293414999" name="InterruptResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::InterruptResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293430498" name="MemoryPartition (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::MemoryPartition"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293444451" name="SwConcurrentResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwConcurrentResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293459497" name="SwSchedulableResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwSchedulableResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293479090" name="SwTimerResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::SwTimerResource"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif" id="composite.tool.abstraction_1286293488059" name="EntryPoint (Abstraction)" refToolId="composite.tool.abstraction"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Concurrency::EntryPoint"/></stereotypesToApply></postAction></aspectTool><separator id="Separator_1286293501027"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293498730" name="DeviceBroker (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Brokering::DeviceBroker"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293518651" name="MemoryBroker (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Brokering::MemoryBroker"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><separator id="Separator_1286293547010"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif" id="composite.tool.connector_1286293544728" name="MessageComResource (Connector)" refToolId="composite.tool.connector"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::MessageComResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293556791" name="NotificationResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::NotificationResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293569134" name="SharedDataComResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SharedDataComResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293579399" name="SwCommunicationResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwCommunicationResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293612820" name="SwInteractionResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwInteractionResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293622163" name="SwMutualExclusionResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwMutualExclusionResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286293641787" name="SwSynchronizationResource (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_DesignModel::SRM::SW_Interaction::SwSynchronizationResource"/></stereotypesToApply></postAction><postAction displayKind="TextIconStereotype" displayPlace="Compartment" id="org.eclipse.papyrus.postaction.changeStereotypeDisplayProvider"/></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-Time.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-Time.Palette.xml
deleted file mode 100644
index 4cc66ba..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/CompositeDiag-Time.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286291144244" name="MARTE/Time"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" id="composite.tool.property_1286291192820" name="Clock (Property)" refToolId="composite.tool.property"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::Clock"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1286291207835" name="ClockType (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::ClockType"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif" id="composite.tool.class_1286291233427" name="TimedDomain (Class)" refToolId="composite.tool.class"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedDomain"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif" id="composite.tool.activity_1286291259582" name="TimedProcessing (Activity)" refToolId="composite.tool.activity"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedProcessing"/></stereotypesToApply></postAction></aspectTool><separator id="Separator_1286291271238"/><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="composite.tool.constraint_1286291268629" name="ClockConstraint (Constraint)" refToolId="composite.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::ClockConstraint"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" id="composite.tool.constraint_1286291275050" name="TimedConstraint (Constraint)" refToolId="composite.tool.constraint"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedConstraint"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif" id="composite.tool.durationobservation_1286291278785" name="TimedDurationObservation (DurationObservation)" refToolId="composite.tool.durationobservation"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedDurationObservation"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif" id="composite.tool.timeobservation_1286291281784" name="TimedInstantObservation (TimeObservation)" refToolId="composite.tool.timeobservation"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::Time::TimedInstantObservation"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/palettes/StateMachineDiag-CoreElements.Palette.xml b/core/org.eclipse.papyrus.marte.static.profile/palettes/StateMachineDiag-CoreElements.Palette.xml
deleted file mode 100644
index 5fefd7c..0000000
--- a/core/org.eclipse.papyrus.marte.static.profile/palettes/StateMachineDiag-CoreElements.Palette.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><paletteDefinition><content><drawer iconpath="/icons/drawer.gif" id="Drawer__1286355073647" name="MARTE/CoreElements"><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif" id="createTransitionCreationTool_1286355130937" name="ModeTransition (Transition)" refToolId="statemachine.createEdgesGroup.transition"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::ModeTransition"/></stereotypesToApply></postAction></aspectTool><aspectTool description="Create an element with a stereotype" iconpath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif" id="createStateCreationTool_1286355133577" name="Mode (State)" refToolId="statemachine.createNodesGroup.state"><postAction id="org.eclipse.papyrus.applystereotypeactionprovider"><stereotypesToApply><stereotype stereotypeName="MARTE::MARTE_Foundations::CoreElements::Mode"/></stereotypesToApply></postAction></aspectTool></drawer></content></paletteDefinition>
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.marte.static.profile/plugin.xml b/core/org.eclipse.papyrus.marte.static.profile/plugin.xml
index 2d02e88..2bb8793 100644
--- a/core/org.eclipse.papyrus.marte.static.profile/plugin.xml
+++ b/core/org.eclipse.papyrus.marte.static.profile/plugin.xml
@@ -42,7 +42,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/NFPs/1">
       </package>
    </extension-->
@@ -162,7 +162,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/GRM/1">
       </package>
    </extension-->
@@ -177,7 +177,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/Alloc/1">
       </package>
    </extension-->
@@ -192,7 +192,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/CoreElements/1">
       </package>
    </extension-->
@@ -207,7 +207,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HLAM/1">
       </package>
    </extension-->
@@ -222,7 +222,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwComputing/1">
       </package>
    </extension-->
@@ -251,7 +251,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwCommunication/1">
       </package>
    </extension-->
@@ -266,7 +266,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwTiming/1">
       </package>
    </extension-->
@@ -281,7 +281,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwDevice/1">
       </package>
    </extension-->
@@ -303,7 +303,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwMemory/1">
       </package>
    </extension-->
@@ -318,7 +318,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwStorageManager/1">
       </package>
    </extension-->
@@ -340,7 +340,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwLayout/1">
       </package>
    </extension-->
@@ -355,7 +355,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwPower/1">
       </package>
    </extension-->
@@ -370,7 +370,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwGeneral/1">
       </package>
    </extension-->
@@ -392,7 +392,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/SW_ResourceCore/1">
       </package>
    </extension-->
@@ -407,7 +407,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/SW_Concurrency/1">
       </package>
    </extension-->
@@ -422,7 +422,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/SW_Brokering/1">
       </package>
    </extension-->
@@ -437,7 +437,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/SW_Interaction/1">
       </package>
    </extension-->
@@ -452,7 +452,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/GCM/1">
       </package>
    </extension-->
@@ -467,7 +467,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/GQAM/1">
       </package>
    </extension-->
@@ -482,7 +482,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/SAM/1">
       </package>
    </extension-->
@@ -497,7 +497,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/PAM/1">
       </package>
    </extension-->
@@ -512,7 +512,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/RSM/1">
       </package>
    </extension-->
@@ -534,7 +534,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/DataTypes/1">
       </package>
    </extension-->
@@ -556,457 +556,11 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/Variables/1">
       </package>
    </extension-->
    <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-NFPs-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="/resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-NFPs-Palette"
-            path="/palettes/ClassDiag-NFPs.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-Alloc-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-Alloc-Palette"
-            path="/palettes/ClassDiag-Alloc.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-Time-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-Time-Palette"
-            path="/palettes/ClassDiag-Time.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-GRM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-GRM-Palette"
-            path="/palettes/ClassDiag-GRM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-GCM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-GCM-Palette"
-            path="/palettes/ClassDiag-GCM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-HLAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-HLAM-Palette"
-            path="/palettes/ClassDiag-HLAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-HRM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-HRM-Palette"
-            path="/palettes/ClassDiag-HRM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-SRM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-SRM-Palette"
-            path="/palettes/ClassDiag-SRM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ClassDiagram-GQAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ClassDiagram-GQAM-Palette"
-            path="/palettes/ClassDiag-GQAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.clazz">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ActivityDiagram-GCM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ActivityDiagram-GCM-Palette"
-            path="/palettes/ActivityDiag-GCM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.activity">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ActivityDiagram-HLAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ActivityDiagram-HLAM-Palette"
-            path="/palettes/ActivityDiag-HLAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.activity"></editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ActivityDiagram-GQAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ActivityDiagram-GQAM-Palette"
-            path="/palettes/ActivityDiag-GQAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.activity"></editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ActivityDiagram-NFPs-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ActivityDiagram-NFPs-Palette"
-            path="/palettes/ActivityDiag-NFPs.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.activity">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ActivityDiagram-PAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ActivityDiagram-PAM-Palette"
-            path="/palettes/ActivityDiag-PAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.activity">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ActivityDiagram-SAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ActivityDiagram-SAM-Palette"
-            path="/palettes/ActivityDiag-SAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.activity">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="ActivityDiagram-Time-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="ActivityDiagram-Time-Palette"
-            path="/palettes/ActivityDiag-Time.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.activity">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-Alloc-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-Alloc-Palette"
-            path="/palettes/CompositeDiag-Alloc.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-CoreElements-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-CoreElements-Palette"
-            path="/palettes/CompositeDiag-CoreElements.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-GCM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-GCM-Palette"
-            path="/palettes/CompositeDiag-GCM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-GRM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-GRM-Palette"
-            path="/palettes/CompositeDiag-GRM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-HLAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-HLAM-Palette"
-            path="/palettes/CompositeDiag-HLAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-HRM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-HRM-Palette"
-            path="/palettes/CompositeDiag-HRM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-NFPs-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-NFPs-Palette"
-            path="/palettes/CompositeDiag-NFPs.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-PAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-PAM-Palette"
-            path="/palettes/CompositeDiag-PAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-SAM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-SAM-Palette"
-            path="/palettes/CompositeDiag-SAM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-SRM-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-SRM-Palette"
-            path="/palettes/CompositeDiag-SRM.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="CompositeDiagram-Time-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="CompositeDiagram-Time-Palette"
-            path="/palettes/CompositeDiag-Time.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.composite">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
-      <paletteDefinition
-            ID="StateMachineDiagram-CoreElements-Palette"
-            class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
-            icon="resources/icons/MARTE_16x16.gif"
-            name="StateMachineDiagram-CoreElements-Palette"
-            path="/palettes/StateMachineDiag-CoreElements.Palette.xml">
-         <Priority
-               name="Highest">
-         </Priority>
-         <editor
-               id="org.eclipse.papyrus.uml.diagram.statemachine">
-         </editor>
-      </paletteDefinition>
-   </extension>
-   <extension
          point="org.eclipse.uml2.uml.generated_package">
       <profile
             location="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_jg_Z8PfhEd-f4r3MXmUB9g"
@@ -1017,7 +571,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/Operators/1">
       </package>
    </extension-->
@@ -1025,7 +579,7 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStoragePackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwStorage/1">
       </package>
    </extension>
@@ -1338,32 +892,32 @@
          point="org.eclipse.emf.ecore.generated_package">
       <package
             class="org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.VSLPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/VSL/1">
       </package>
       <!--package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwLogicalPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwLogical/1">
       </package-->
       <!--package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPhysicalPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HwPhysical/1">
       </package-->
       <!--package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SRMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/SRM/1">
       </package-->
       <!--package
             class="org.eclipse.papyrus.MARTE.MARTEPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/MARTE/1">
       </package-->
       <!--package
             class="org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HRMPackage"
-            genModel="MARTE.genmodel"
+            genModel="resources/MARTE.genmodel"
             uri="http://www.eclipse.org/papyrus/HRM/1">
       </package-->
    </extension>
diff --git a/core/pom.xml b/core/pom.xml
index 97b76fc..44e7f81 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -14,6 +14,7 @@
 
 	<modules>
 		<module>org.eclipse.papyrus.marte.static.profile</module>
+		<module>org.eclipse.papyrus.marte.static.profile.ui</module>
 		<module>org.eclipse.papyrus.marte.vsl</module>
 		<module>org.eclipse.papyrus.marte.vsl.ui</module>
 	</modules>
diff --git a/releng/org.eclipse.papyrus.marte.core.feature/feature.xml b/releng/org.eclipse.papyrus.marte.core.feature/feature.xml
index c21c669..11a54df 100644
--- a/releng/org.eclipse.papyrus.marte.core.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.marte.core.feature/feature.xml
@@ -6,15 +6,11 @@
       provider-name="%providerName">
 
    <description url="https://eclipse.org/papyrus/">
-      This feature provides a Papyrus implementation of the MARTE profile. It contains the static (in-memory)
-	  and UI features dedicated to MARTE:
-	  - Palette
-	  - Properties view
-	  - Xtext support
+      This feature provides a Papyrus implementation of the MARTE static profile.
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-All rights reserved.   This program and the accompanying materials
+      All rights reserved.   This program and the accompanying materials
 are made available under the terms of the Eclipse Public License
 v1.0
 which accompanies this distribution, and is available at
@@ -31,19 +27,5 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-		 
-	<plugin
-         id="org.eclipse.papyrus.marte.vsl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-		 
-	<plugin
-         id="org.eclipse.papyrus.marte.vsl.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
 </feature>
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/.project b/releng/org.eclipse.papyrus.marte.full.feature/.project
new file mode 100644
index 0000000..3070465
--- /dev/null
+++ b/releng/org.eclipse.papyrus.marte.full.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.marte.full.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/build.properties b/releng/org.eclipse.papyrus.marte.full.feature/build.properties
new file mode 100644
index 0000000..cff2bd5
--- /dev/null
+++ b/releng/org.eclipse.papyrus.marte.full.feature/build.properties
@@ -0,0 +1,6 @@
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               license.html,\
+               feature.properties
+src.includes = epl-v10.html,\
+               license.html
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/epl-v10.html b/releng/org.eclipse.papyrus.marte.full.feature/epl-v10.html
new file mode 100644
index 0000000..cb1073a
--- /dev/null
+++ b/releng/org.eclipse.papyrus.marte.full.feature/epl-v10.html
@@ -0,0 +1,304 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	
+	}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang="EN-US" style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/feature.properties b/releng/org.eclipse.papyrus.marte.full.feature/feature.properties
new file mode 100644
index 0000000..a1b1fe0
--- /dev/null
+++ b/releng/org.eclipse.papyrus.marte.full.feature/feature.properties
@@ -0,0 +1,137 @@
+# NLS_MESSAGEFORMAT_VAR
+
+# "featureName" property - name of the feature
+featureName=Papyrus MARTE core (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Modeling Project 
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 9, 2014\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+\t- Content may be structured and packaged into modules to facilitate delivering,\n\
+\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+\t  plug-in fragments ("Fragments"), and features ("Features").\n\
+\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+\t  in a directory named "plugins".\n\
+\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
+\t  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+\t- The top-level (root) directory\n\
+\t- Plug-in and Fragment directories\n\
+\t- Inside Plug-ins and Fragments packaged as JARs\n\
+\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
+\t- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\t   extending or updating the functionality of an Eclipse-based product.\n\
+\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
+\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
+\t   of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/feature.xml b/releng/org.eclipse.papyrus.marte.full.feature/feature.xml
new file mode 100644
index 0000000..d651725
--- /dev/null
+++ b/releng/org.eclipse.papyrus.marte.full.feature/feature.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.papyrus.marte.full.feature"
+      label="%featureName"
+      version="1.2.2.qualifier"
+      provider-name="%providerName">
+
+   <description url="https://eclipse.org/papyrus/">
+      This feature provides a Papyrus implementation of the MARTE profile. It contains the static (in-memory)
+   and UI features dedicated to MARTE:
+   - Palette
+   - Properties view
+   - Xtext support
+   </description>
+
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      All rights reserved.   This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.papyrus.marte.core.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.marte.vsl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.marte.vsl.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.marte.static.profile.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/license.html b/releng/org.eclipse.papyrus.marte.full.feature/license.html
new file mode 100644
index 0000000..c3d34c3
--- /dev/null
+++ b/releng/org.eclipse.papyrus.marte.full.feature/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/pom.xml b/releng/org.eclipse.papyrus.marte.full.feature/pom.xml
new file mode 100644
index 0000000..be871af
--- /dev/null
+++ b/releng/org.eclipse.papyrus.marte.full.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus.marte</groupId>
+		<artifactId>org.eclipse.papyrus.marte.releng</artifactId>
+		<version>1.2.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.marte.full.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+	<name>MARTE profile and VSL</name>
+	<description>This feature adds a static MARTE profile and VSL support.</description>
+</project>
\ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index 781bb8a..cf54071 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -13,6 +13,7 @@
 	<description>This plug-in contains the different modules relatives to the releng of MARTE from update site, to feature, product and rcp.</description>
 	<modules>
 		<module>org.eclipse.papyrus.marte.core.feature</module>
+		<module>org.eclipse.papyrus.marte.full.feature</module>
 		<module>org.eclipse.papyrus.marte.view.feature</module>
 		<module>org.eclipse.papyrus.marte.textedit.feature</module>
 	</modules>
@@ -31,4 +32,4 @@
 			</modules>
 		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>