393457: Align R4E Model with Common Reviews Model

•Reintegrate Forked Core R4E Model and Reviews into Common Model
•Improve R4E Ecore, GenModel and generated Code
•Update Model Dependencies
•Reintegrate with master code base

Change-Id: I5b742f4df017aca8761160461fe04f128f8ce2a8
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=393457

314 files changed, 7562 insertions, 14609 deletions

diff --git a/org.eclipse.mylyn.reviews.frame.core/.classpath b/org.eclipse.mylyn.reviews.frame.core/.classpath
deleted file mode 100644
index 304e8618..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.reviews.frame.core/.project b/org.eclipse.mylyn.reviews.frame.core/.project
deleted file mode 100644
index 08df34e0..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.reviews.frame.core</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>InCode.inCodeBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>InCode.inCodeNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 14d87023..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Oct 28 18:22:21 EDT 2010
-eclipse.preferences.version=1
-encoding//model/org.eclipse.mylyn.reviews.r4e.core.model.ecore=UTF-8
-encoding//model/org.eclipse.mylyn.reviews.r4e.core.model.ecorediag=UTF-8
-encoding//model/r4e.design.rules.ecorediag=UTF-8
diff --git a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7be1805c..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,359 +0,0 @@
-#Sun May 29 17:20:20 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-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=48
-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_selector_in_method_invocation=80
-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.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-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_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=false
-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=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_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=false
-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=120
-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=insert
-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_member=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=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_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_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_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_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_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_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_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_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=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-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=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-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=1
-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_outer_expressions_when_nested=true
diff --git a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 0d184511..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,65 +0,0 @@
-#Sun May 29 17:20:20 CEST 2011
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=12
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-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">/**\r\n * @return the ${bare_field_name}\r\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">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\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">/**\r\n * \r\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">/**\r\n * ${tags}\r\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"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) ${year} Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\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">\r\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">\r\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">\r\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">\r\n</template><template autoinsert\="false" 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\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" 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}\r\n// ignore</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><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\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.wst.jsdt.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.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 5e7f2bd4..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Aug 18 22:42:26 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26a..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 25 03:02:37 GMT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 10d0afb9..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-commit.comment.template=${task.key}\: ${task.description}\n\nTask-Url\: ${task.url}
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d562..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.reviews.frame.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.frame.core/META-INF/MANIFEST.MF
deleted file mode 100644
index f90680c2..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.mylyn.reviews.frame.core;singleton:=true
-Bundle-Version: 0.13.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.reviews.frame.core.model;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.frame.core.model.impl;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.frame.core.model.util;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.frame.core.utils;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.ui, org.eclipse.mylyn.reviews.r4e.core.tests, org.eclipse.mylyn.reviews.ldap, org.eclipse.mylyn.reviews.notifications, org.eclipse.mylyn.reviews.r4e.report, org.eclipse.mylyn.reviews.r4e.transform"
-Require-Bundle: 
- org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.emf.ecore;bundle-version="2.5.0"
-Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.mylyn.reviews.frame.core/about.html b/org.eclipse.mylyn.reviews.frame.core/about.html
deleted file mode 100644
index 23193b85..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>January, 2011</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/org.eclipse.mylyn.reviews.frame.core/build.properties b/org.eclipse.mylyn.reviews.frame.core/build.properties
deleted file mode 100644
index 51813828..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2012 Ericsson AB and others.
-# 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:
-#     Ericsson AB - initial API and implementation
-###############################################################################
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/org.eclipse.mylyn.reviews.frame.core/model/framework.genmodel b/org.eclipse.mylyn.reviews.frame.core/model/framework.genmodel
deleted file mode 100644
index 0ec5eb13..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/model/framework.genmodel
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=""

-    modelDirectory="/org.eclipse.mylyn.reviews.frame.core/src" modelPluginID="org.eclipse.mylyn.reviews.frame.core"

-    modelName="Framework" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"

-    complianceLevel="6.0" copyrightFields="false" language="">

-  <foreignModel>org.eclipse.mylyn.reviews.frame.core.model.ecore</foreignModel>

-  <genPackages prefix="Model" basePackage="org.eclipse.mylyn.reviews.frame.core" disposableProviderFactory="true"

-      ecorePackage="org.eclipse.mylyn.reviews.frame.core.model.ecore#/">

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review/topics"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review/reviewItems"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review/reviewTask"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review/state"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment/user"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment/type"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment/description"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Item">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Item/addedBy"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Item/review"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Location"/>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//User">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//User/id"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//User/email"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//TaskReference">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//TaskReference/taskId"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//TaskReference/repositoryURL"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewState"/>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup/reviews"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup/reviewGroupTask"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup/description"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//CommentType"/>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/task"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/location"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/comments"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/review"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/title"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent/enabled"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot/fragmentVersion"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot/compatibility"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot/applicationVersion"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore b/org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore
deleted file mode 100644
index 8a64811f..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"

-    nsURI="http://org.eclipse.mylyn.reviews.frame.core.model/1.0" nsPrefix="org.eclipse.mylyn.reviews.frame.core">

-  <eClassifiers xsi:type="ecore:EClass" name="Review" eSuperTypes="#//ReviewComponent #//SubModelRoot">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="topics" upperBound="-1"

-        eType="#//Topic" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="reviewItems" upperBound="-1"

-        eType="#//Item" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="reviewTask" eType="#//TaskReference"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="state" lowerBound="1" eType="#//ReviewState"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//ReviewComponent">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="user" lowerBound="1" eType="#//User"

-        resolveProxies="false"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//CommentType"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Item" eSuperTypes="#//ReviewComponent">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="addedBy" lowerBound="1"

-        eType="#//User"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="review" lowerBound="1"

-        eType="#//Review"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Location" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="User">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="email" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TaskReference" eSuperTypes="#//ReviewComponent">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="taskId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="repositoryURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ReviewState" abstract="true" eSuperTypes="#//ReviewComponent"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ReviewGroup" eSuperTypes="#//ReviewComponent #//SubModelRoot">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="reviews" upperBound="-1"

-        eType="#//Review" transient="true" derived="true" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="reviewGroupTask" eType="#//TaskReference"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="CommentType" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Topic" eSuperTypes="#//Comment">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="task" eType="#//TaskReference"

-        containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="location" upperBound="-1"

-        eType="#//Location" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="comments" upperBound="-1"

-        eType="#//Comment" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="review" lowerBound="1"

-        eType="#//Review"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ReviewComponent">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-        defaultValueLiteral="true" iD="true">

-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

-        <details key="namespace" value=""/>

-        <details key="wildcards" value=""/>

-        <details key="name" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SubModelRoot">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fragmentVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        defaultValueLiteral="0.8.0"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="compatibility" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"

-        transient="true" unsettable="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="applicationVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        transient="true" defaultValueLiteral="1.0.0" unsettable="true" derived="true"/>

-  </eClassifiers>

-</ecore:EPackage>

diff --git a/org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecorediag b/org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecorediag
deleted file mode 100644
index 373824cf..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecorediag
+++ /dev/null
@@ -1,483 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_ombFkbddEd-lI8UEEXo2gw" type="EcoreTools" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_on_L0LddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooC2MLddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooC2MbddEd-lI8UEEXo2gw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooC2MrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooC2M7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooC2NLddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooDdQLddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooDdQbddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooDdQrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooDdQ7ddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_on_L0bddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_on_L0rddEd-lI8UEEXo2gw" x="420" y="24"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ooEEULddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooErYLddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooErYbddEd-lI8UEEXo2gw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_ooHusLddEd-lI8UEEXo2gw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment/description"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ooHusbddEd-lI8UEEXo2gw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooErYrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooErY7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooErZLddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooErZbddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooErZrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooErZ7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooEraLddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ooEEUbddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ooEEUrddEd-lI8UEEXo2gw" x="456" y="204"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ooHusrddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooIVwLddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooIVwbddEd-lI8UEEXo2gw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooIVwrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooIVw7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooIVxLddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooIVxbddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooIVxrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooIVx7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooIVyLddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ooHus7ddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Item"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ooHutLddEd-lI8UEEXo2gw" x="768" y="300"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ooIVybddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooI80LddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooJj4LddEd-lI8UEEXo2gw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooJj4bddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooJj4rddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooJj47ddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooJj5LddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooJj5bddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooJj5rddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooJj57ddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ooIVyrddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Location"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ooIVy7ddEd-lI8UEEXo2gw" x="48" y="480"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ooKK8LddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooKK87ddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooKyALddEd-lI8UEEXo2gw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_ooKyCLddEd-lI8UEEXo2gw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//User/id"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ooKyCbddEd-lI8UEEXo2gw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_odJ54GFIEeCFVY01TT49FA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//User/email"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_odJ54WFIEeCFVY01TT49FA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooKyAbddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooKyArddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooKyA7ddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooKyBLddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooKyBbddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooKyBrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooKyB7ddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ooKK8bddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//User"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ooKK8rddEd-lI8UEEXo2gw" x="504" y="456"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ooKyCrddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooLZELddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooLZEbddEd-lI8UEEXo2gw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_adw-8MTpEd-et90B0t7vvA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//TaskReference/taskId"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_adw-8cTpEd-et90B0t7vvA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_fqtEIdxyEd-eJK4DEqmU3Q" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//TaskReference/repositoryURL"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fqtrMNxyEd-eJK4DEqmU3Q"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooLZErddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooLZE7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooLZFLddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooLZFbddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooLZFrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooLZF7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooLZGLddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ooKyC7ddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//TaskReference"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ooKyDLddEd-lI8UEEXo2gw" x="84"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ooOcZLddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooPDcLddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooPDcbddEd-lI8UEEXo2gw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooPDcrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooPDc7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooPDdLddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooPDdbddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooPDdrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooPDd7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooPDeLddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ooOcZbddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewState"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ooOcZrddEd-lI8UEEXo2gw" x="684" y="24"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ooPqgLddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooPqg7ddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooPqhLddEd-lI8UEEXo2gw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_3I3JwfwFEd-N35nkMkr2Sg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup/description"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3I3JwvwFEd-N35nkMkr2Sg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooPqhbddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooPqhrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooPqh7ddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooQRkLddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooQRkbddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooQRkrddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooQRk7ddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ooPqgbddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ooPqgrddEd-lI8UEEXo2gw" x="372" y="-120"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ooQRlLddEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ooQ4oLddEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ooQ4obddEd-lI8UEEXo2gw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooQ4orddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooQ4o7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooQ4pLddEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooQ4pbddEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ooQ4prddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ooQ4p7ddEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ooQ4qLddEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ooQRlbddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//CommentType"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ooQRlrddEd-lI8UEEXo2gw" x="420" y="120"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_5BMcoLdiEd-lI8UEEXo2gw" type="Note" fontName="Segoe UI" description="Items could be:&#xD;&#xA;  - ChangeSet&#xD;&#xA;  - Patch&#xD;&#xA;  - Resource" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-    <children xmi:type="notation:BasicDecorationNode" xmi:id="_5BR8MLdiEd-lI8UEEXo2gw" type="DiagramName">

-      <element xsi:nil="true"/>

-    </children>

-    <children xmi:type="notation:BasicDecorationNode" xmi:id="_5BSjQLdiEd-lI8UEEXo2gw" type="Description">

-      <element xsi:nil="true"/>

-    </children>

-    <styles xmi:type="notation:TextStyle" xmi:id="_5BMcobdiEd-lI8UEEXo2gw"/>

-    <styles xmi:type="notation:LineTypeStyle" xmi:id="_5BMcordiEd-lI8UEEXo2gw"/>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5BMco7diEd-lI8UEEXo2gw" x="792" y="360" width="172" height="98"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_-I-0EcV_Ed-OHt4UvkWdIw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_-JDFgMV_Ed-OHt4UvkWdIw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_-JEToMV_Ed-OHt4UvkWdIw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_HXHhEPwGEd-N35nkMkr2Sg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/title"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HXHhEfwGEd-N35nkMkr2Sg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_-JETocV_Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_-JETosV_Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-JETo8V_Ed-OHt4UvkWdIw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_-JE6sMV_Ed-OHt4UvkWdIw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_-JE6scV_Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_-JE6ssV_Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-JE6s8V_Ed-OHt4UvkWdIw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_-I-0EsV_Ed-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-I_bIMV_Ed-OHt4UvkWdIw" x="36" y="312"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_lyFVoNfeEd-8btOkTKx9Xg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_lyHK0NfeEd-8btOkTKx9Xg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_lyHx4NfeEd-8btOkTKx9Xg" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_sLUIkNfeEd-8btOkTKx9Xg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent/enabled"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sLUIkdfeEd-8btOkTKx9Xg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lyHx4dfeEd-8btOkTKx9Xg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_lyHx4tfeEd-8btOkTKx9Xg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lyHx49feEd-8btOkTKx9Xg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_lyJAANfeEd-8btOkTKx9Xg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lyJAAdfeEd-8btOkTKx9Xg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_lyJAAtfeEd-8btOkTKx9Xg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lyJAA9feEd-8btOkTKx9Xg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lyFVodfeEd-8btOkTKx9Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyFVotfeEd-8btOkTKx9Xg" x="-108" y="84"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_QW3-kNhdEd-90LfO9ujCCw" type="Note" fontName="Segoe UI" description="ReviewComponent is supertype of:   ReviewGroup, Review, TaskReference, Comment and Item" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-    <children xmi:type="notation:BasicDecorationNode" xmi:id="_QW9eINhdEd-90LfO9ujCCw" type="DiagramName">

-      <element xsi:nil="true"/>

-    </children>

-    <children xmi:type="notation:BasicDecorationNode" xmi:id="_QW-FMNhdEd-90LfO9ujCCw" type="Description">

-      <element xsi:nil="true"/>

-    </children>

-    <styles xmi:type="notation:TextStyle" xmi:id="_QW4loNhdEd-90LfO9ujCCw"/>

-    <styles xmi:type="notation:LineTypeStyle" xmi:id="_QW4lodhdEd-90LfO9ujCCw"/>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QW4lothdEd-90LfO9ujCCw" x="-108" y="144" width="133" height="157"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_oanvMFM7EeGvOsiC17Al5Q" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_oatOwFM7EeGvOsiC17Al5Q" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_oauc4FM7EeGvOsiC17Al5Q" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_sCKdoFM7EeGvOsiC17Al5Q" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot/fragmentVersion"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sCKdoVM7EeGvOsiC17Al5Q"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_ZS_bIFQfEeGBIose-P8vWA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot/compatibility"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZS_bIVQfEeGBIose-P8vWA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_DSleIFUTEeGBIose-P8vWA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot/applicationVersion"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DSleIVUTEeGBIose-P8vWA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_oauc4VM7EeGvOsiC17Al5Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_oauc4lM7EeGvOsiC17Al5Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_oauc41M7EeGvOsiC17Al5Q"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oavD8FM7EeGvOsiC17Al5Q" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_oavD8VM7EeGvOsiC17Al5Q"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_oavD8lM7EeGvOsiC17Al5Q"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_oavD81M7EeGvOsiC17Al5Q"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_oanvMVM7EeGvOsiC17Al5Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oanvMlM7EeGvOsiC17Al5Q" x="702" y="-82" width="213"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_ombFkrddEd-lI8UEEXo2gw"/>

-  <element xmi:type="ecore:EPackage" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_ooapoLddEd-lI8UEEXo2gw" type="3002" source="_on_L0LddEd-lI8UEEXo2gw" target="_-I-0EcV_Ed-OHt4UvkWdIw">

-    <children xmi:type="notation:Node" xmi:id="_oobQsLddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oobQsbddEd-lI8UEEXo2gw" x="-5" y="-17"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oob3wLddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oob3wbddEd-lI8UEEXo2gw" x="27" y="-6"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ooapobddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ooaporddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review/topics"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ooapo7ddEd-lI8UEEXo2gw" points="[-26, 21, 317, -253]$[-334, 267, 9, -7]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sMjbgdfaEd-8btOkTKx9Xg" id="(0.9117647058823529,0.16279069767441862)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_oob3wrddEd-lI8UEEXo2gw" type="3002" source="_on_L0LddEd-lI8UEEXo2gw" target="_ooHusrddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_ooce0LddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooce0bddEd-lI8UEEXo2gw" x="-10" y="31"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooce0rddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooce07ddEd-lI8UEEXo2gw" x="31" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_oob3w7ddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_oob3xLddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review/reviewItems"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oob3xbddEd-lI8UEEXo2gw" points="[7, 6, -286, -257]$[286, 256, -7, -7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mW2zcNfaEd-8btOkTKx9Xg" id="(0.5588235294117647,0.8604651162790697)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mW2zcdfaEd-8btOkTKx9Xg" id="(0.0784313725490196,0.5581395348837209)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ooce1LddEd-lI8UEEXo2gw" type="3002" source="_on_L0LddEd-lI8UEEXo2gw" target="_ooKyCrddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_ooce2LddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooce2bddEd-lI8UEEXo2gw" x="-12" y="-16"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oodF4LddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oodF4bddEd-lI8UEEXo2gw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ooce1bddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ooce1rddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review/reviewTask"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ooce17ddEd-lI8UEEXo2gw" points="[0, 0, 0, 171]$[0, -171, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orWB0bddEd-lI8UEEXo2gw" id="(0.49019607843137253,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orWo4LddEd-lI8UEEXo2gw" id="(0.5,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_oodF4rddEd-lI8UEEXo2gw" type="3002" source="_on_L0LddEd-lI8UEEXo2gw" target="_ooOcZLddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_oodF5rddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oodF57ddEd-lI8UEEXo2gw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oodF6LddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oodF6bddEd-lI8UEEXo2gw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_oodF47ddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_oodF5LddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review/state"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oodF5bddEd-lI8UEEXo2gw" points="[0, 0, -330, 60]$[330, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orTlkbddEd-lI8UEEXo2gw" id="(0.22549019607843138,0.5813953488372093)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orUMoLddEd-lI8UEEXo2gw" id="(0.9432624113475178,0.7058823529411765)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_oods-LddEd-lI8UEEXo2gw" type="3002" source="_-I-0EcV_Ed-OHt4UvkWdIw" target="_ooIVybddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_ooeUALddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooeUAbddEd-lI8UEEXo2gw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooeUArddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooeUA7ddEd-lI8UEEXo2gw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_oods-bddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_oods-rddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/location"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oods-7ddEd-lI8UEEXo2gw" points="[18, 41, -128, -300]$[139, 324, -7, -17]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gH3JUNfUEd-8btOkTKx9Xg" id="(0.4019607843137255,0.8837209302325582)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ooeUBLddEd-lI8UEEXo2gw" type="3002" source="_-I-0EcV_Ed-OHt4UvkWdIw" target="_ooKyCrddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_ooeUCLddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooeUCbddEd-lI8UEEXo2gw" x="11" y="20"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooe7ELddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooe7EbddEd-lI8UEEXo2gw" x="35" y="18"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ooeUBbddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ooeUBrddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/task"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ooeUB7ddEd-lI8UEEXo2gw" points="[0, 0, 117, 60]$[-117, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oP3rYMWCEd-OHt4UvkWdIw" id="(0.23529411764705882,0.2558139534883721)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orMQ0bddEd-lI8UEEXo2gw" id="(0.8095238095238095,0.9411764705882353)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ooe7ErddEd-lI8UEEXo2gw" type="3002" source="_ooEEULddEd-lI8UEEXo2gw" target="_ooKK8LddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_ooe7FrddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooe7F7ddEd-lI8UEEXo2gw" x="-15" y="16"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooe7GLddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooe7GbddEd-lI8UEEXo2gw" x="7" y="16"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ooe7E7ddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ooe7FLddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment/user"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ooe7FbddEd-lI8UEEXo2gw" points="[0, 3, 11, -126]$[-10, 122, 1, -7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orLpwLddEd-lI8UEEXo2gw" id="(0.7307692307692307,0.17647058823529413)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orLpwbddEd-lI8UEEXo2gw" id="(0.7254901960784313,0.9411764705882353)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_oofiILddEd-lI8UEEXo2gw" type="3002" source="_ooEEULddEd-lI8UEEXo2gw" target="_ooQRlLddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_oofiJLddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oofiJbddEd-lI8UEEXo2gw" x="-9" y="-27"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oofiJrddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oofiJ7ddEd-lI8UEEXo2gw" x="-1" y="15"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_oofiIbddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_oofiIrddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment/type"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oofiI7ddEd-lI8UEEXo2gw" points="[0, 0, -163, 60]$[163, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orLCsLddEd-lI8UEEXo2gw" id="(0.17307692307692307,0.21568627450980393)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orLCsbddEd-lI8UEEXo2gw" id="(0.5,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ooh-YLddEd-lI8UEEXo2gw" type="3002" source="_ooPqgLddEd-lI8UEEXo2gw" target="_on_L0LddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_ooh-ZLddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooh-ZbddEd-lI8UEEXo2gw" x="19" y="-51"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ooh-ZrddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ooh-Z7ddEd-lI8UEEXo2gw" x="-2" y="-17"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ooh-YbddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ooh-YrddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup/reviews"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ooh-Y7ddEd-lI8UEEXo2gw" points="[3, 7, -48, -104]$[50, 110, -1, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qJEWQNCGEd-E7JKHlzdpmg" id="(0.37254901960784315,0.8372093023255814)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qJEWQdCGEd-E7JKHlzdpmg" id="(0.4019607843137255,0.046511627906976744)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ooilcLddEd-lI8UEEXo2gw" type="3002" source="_ooPqgLddEd-lI8UEEXo2gw" target="_ooKyCrddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_oojMgLddEd-lI8UEEXo2gw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oojMgbddEd-lI8UEEXo2gw" x="-50" y="-35"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oojMgrddEd-lI8UEEXo2gw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oojMg7ddEd-lI8UEEXo2gw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ooilcbddEd-lI8UEEXo2gw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ooilcrddEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup/reviewGroupTask"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ooilc7ddEd-lI8UEEXo2gw" points="[0, 0, -138, 60]$[138, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orRwYLddEd-lI8UEEXo2gw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_orRwYbddEd-lI8UEEXo2gw" id="(0.24603174603174602,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_cOJ34MWAEd-OHt4UvkWdIw" type="3002" source="_-I-0EcV_Ed-OHt4UvkWdIw" target="_ooEEULddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_cOLtEMWAEd-OHt4UvkWdIw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_cOLtEcWAEd-OHt4UvkWdIw" x="-5" y="-19"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_cOM7MMWAEd-OHt4UvkWdIw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_cOM7McWAEd-OHt4UvkWdIw" x="-2" y="18"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_cOJ34cWAEd-OHt4UvkWdIw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_cOJ34sWAEd-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/comments"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cOJ348WAEd-OHt4UvkWdIw" points="[2, 12, 2, -96]$[2, 107, 2, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cORMoMWAEd-OHt4UvkWdIw" id="(0.3942307692307692,0.7647058823529411)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cORMocWAEd-OHt4UvkWdIw" id="(0.18269230769230768,0.9019607843137255)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_mIS64MWCEd-OHt4UvkWdIw" type="3003" source="_-I-0EcV_Ed-OHt4UvkWdIw" target="_ooEEULddEd-lI8UEEXo2gw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_mIS64cWCEd-OHt4UvkWdIw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_mIS64sWCEd-OHt4UvkWdIw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mIS648WCEd-OHt4UvkWdIw" points="[43, 16, -413, 121]$[415, 16, -41, 121]$[415, -64, -41, 41]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mIVXIMWCEd-OHt4UvkWdIw" id="(0.5769230769230769,0.13725490196078433)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mIVXIcWCEd-OHt4UvkWdIw" id="(0.9134615384615384,0.17647058823529413)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_nGh4wM_KEd-GSPl2SnbO1w" type="3002" source="_-I-0EcV_Ed-OHt4UvkWdIw" target="_on_L0LddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_nGjt8M_KEd-GSPl2SnbO1w" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_nGjt8c_KEd-GSPl2SnbO1w" x="5" y="-30"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_nGjt8s_KEd-GSPl2SnbO1w" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_nGjt88_KEd-GSPl2SnbO1w" x="36" y="-9"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_nGh4wc_KEd-GSPl2SnbO1w" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_nGh4ws_KEd-GSPl2SnbO1w" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic/review"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nGh4w8_KEd-GSPl2SnbO1w" points="[7, -6, -317, 267]$[74, -66, -250, 207]$[314, -264, -10, 9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nGomcM_KEd-GSPl2SnbO1w" id="(0.6078431372549019,0.20930232558139536)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nGomcc_KEd-GSPl2SnbO1w" id="(0.10784313725490197,0.5348837209302325)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_2qxfwdeLEd-8btOkTKx9Xg" type="3002" source="_ooHusrddEd-lI8UEEXo2gw" target="_ooKK8LddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_2q3mYNeLEd-8btOkTKx9Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2q3mYdeLEd-8btOkTKx9Xg" x="-14" y="19"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_2q40gNeLEd-8btOkTKx9Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2q40gdeLEd-8btOkTKx9Xg" x="2" y="-12"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_2qyG0NeLEd-8btOkTKx9Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_2qyG0deLEd-8btOkTKx9Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Item/addedBy"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2qyG0teLEd-8btOkTKx9Xg" points="[-11, -1, 535, 58]$[-544, -35, 2, 24]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2q-7INeLEd-8btOkTKx9Xg" id="(0.11764705882352941,0.3023255813953488)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2q-7IdeLEd-8btOkTKx9Xg" id="(0.7745098039215687,0.5294117647058824)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_6LHvgNfXEd-8btOkTKx9Xg" type="3002" source="_ooHusrddEd-lI8UEEXo2gw" target="_on_L0LddEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_6LIWkNfXEd-8btOkTKx9Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6LIWkdfXEd-8btOkTKx9Xg" x="-15" y="20"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_6LI9oNfXEd-8btOkTKx9Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6LI9odfXEd-8btOkTKx9Xg" x="21" y="22"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6LHvgdfXEd-8btOkTKx9Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_6LHvgtfXEd-8btOkTKx9Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.frame.core.model.ecore#//Item/review"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6LHvg9fXEd-8btOkTKx9Xg" points="[-5, -5, 266, 253]$[-270, -257, 1, 1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-Sso4NfXEd-8btOkTKx9Xg" id="(0.19607843137254902,0.11627906976744186)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-Sso4dfXEd-8btOkTKx9Xg" id="(0.8823529411764706,0.8837209302325582)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Q5yFoFM8EeGvOsiC17Al5Q" type="3003" source="_ooPqgLddEd-lI8UEEXo2gw" target="_oanvMFM7EeGvOsiC17Al5Q">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Q5yssFM8EeGvOsiC17Al5Q" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Q5yssVM8EeGvOsiC17Al5Q" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q5ysslM8EeGvOsiC17Al5Q" points="[11, 2, -199, -33]$[211, 10, 1, -25]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q52XEFM8EeGvOsiC17Al5Q" id="(0.9256756756756757,0.5882352941176471)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q52XEVM8EeGvOsiC17Al5Q" id="(0.07511737089201878,0.38235294117647056)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Rw0bUFM8EeGvOsiC17Al5Q" type="3003" source="_on_L0LddEd-lI8UEEXo2gw" target="_oanvMFM7EeGvOsiC17Al5Q">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Rw0bUVM8EeGvOsiC17Al5Q" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Rw0bUlM8EeGvOsiC17Al5Q" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Rw0bU1M8EeGvOsiC17Al5Q" points="[32, -10, -184, 60]$[217, -49, 1, 21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rw23kFM8EeGvOsiC17Al5Q" id="(0.6862745098039216,0.23255813953488372)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Rw23kVM8EeGvOsiC17Al5Q" id="(0.014084507042253521,0.6911764705882353)"/>

-  </edges>

-</notation:Diagram>

diff --git a/org.eclipse.mylyn.reviews.frame.core/plugin.properties b/org.eclipse.mylyn.reviews.frame.core/plugin.properties
deleted file mode 100644
index 4fc5a884..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2012 Ericsson AB and others.
-# 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:
-#     Ericsson AB - initial API and implementation
-###############################################################################
-
-pluginName = Mylyn Reviews (Incubation)
-providerName = Eclipse Mylyn
diff --git a/org.eclipse.mylyn.reviews.frame.core/plugin.xml b/org.eclipse.mylyn.reviews.frame.core/plugin.xml
deleted file mode 100644
index ec4aab4d..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://org.eclipse.mylyn.reviews.frame.core.model/1.0"
-            class="org.eclipse.mylyn.reviews.frame.core.model.ModelPackage"
-            genModel="model/framework.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/org.eclipse.mylyn.reviews.frame.core/pom.xml b/org.eclipse.mylyn.reviews.frame.core/pom.xml
deleted file mode 100644
index ff19dc03..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
-    <groupId>org.eclipse.mylyn.reviews.r4e</groupId>
-    <version>0.13.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>org.eclipse.mylyn.reviews.frame.core</artifactId>
-  <version>0.13.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Comment.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Comment.java
deleted file mode 100644
index ba859dc0..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Comment.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Comment</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getUser <em>User</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getComment()
- * @model
- * @generated
- */
-public interface Comment extends ReviewComponent {
-	/**
-	 * Returns the value of the '<em><b>User</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>User</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>User</em>' reference.
-	 * @see #setUser(User)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getComment_User()
-	 * @model resolveProxies="false" required="true"
-	 * @generated
-	 */
-	User getUser();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getUser <em>User</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>User</em>' reference.
-	 * @see #getUser()
-	 * @generated
-	 */
-	void setUser(User value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' containment reference.
-	 * @see #setType(CommentType)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getComment_Type()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	CommentType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getType <em>Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' containment reference.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(CommentType value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getComment_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-} // Comment
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/CommentType.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/CommentType.java
deleted file mode 100644
index 206c1805..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/CommentType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Comment Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getCommentType()
- * @model abstract="true"
- * @generated
- */
-public interface CommentType extends EObject {
-
-} // CommentType
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Item.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Item.java
deleted file mode 100644
index 8ad317cb..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Item.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Item</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Item#getAddedBy <em>Added By</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Item#getReview <em>Review</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getItem()
- * @model
- * @generated
- */
-public interface Item extends ReviewComponent {
-	/**
-	 * Returns the value of the '<em><b>Added By</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Added By</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Added By</em>' reference.
-	 * @see #setAddedBy(User)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getItem_AddedBy()
-	 * @model required="true"
-	 * @generated
-	 */
-	User getAddedBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Item#getAddedBy <em>Added By</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Added By</em>' reference.
-	 * @see #getAddedBy()
-	 * @generated
-	 */
-	void setAddedBy(User value);
-
-	/**
-	 * Returns the value of the '<em><b>Review</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Review</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Review</em>' reference.
-	 * @see #setReview(Review)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getItem_Review()
-	 * @model required="true"
-	 * @generated
-	 */
-	Review getReview();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Item#getReview <em>Review</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Review</em>' reference.
-	 * @see #getReview()
-	 * @generated
-	 */
-	void setReview(Review value);
-
-} // Item
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Location.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Location.java
deleted file mode 100644
index 3e699d7e..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Location.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Location</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getLocation()
- * @model abstract="true"
- * @generated
- */
-public interface Location extends EObject {
-
-} // Location
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ModelFactory.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ModelFactory.java
deleted file mode 100644
index c5a54617..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ModelFactory.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage
- * @generated
- */
-public interface ModelFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ModelFactory	eINSTANCE	= org.eclipse.mylyn.reviews.frame.core.model.impl.ModelFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Review</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Review</em>'.
-	 * @generated
-	 */
-	Review createReview();
-
-	/**
-	 * Returns a new object of class '<em>Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Comment</em>'.
-	 * @generated
-	 */
-	Comment createComment();
-
-	/**
-	 * Returns a new object of class '<em>Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Item</em>'.
-	 * @generated
-	 */
-	Item createItem();
-
-	/**
-	 * Returns a new object of class '<em>User</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>User</em>'.
-	 * @generated
-	 */
-	User createUser();
-
-	/**
-	 * Returns a new object of class '<em>Task Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Task Reference</em>'.
-	 * @generated
-	 */
-	TaskReference createTaskReference();
-
-	/**
-	 * Returns a new object of class '<em>Review Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Review Group</em>'.
-	 * @generated
-	 */
-	ReviewGroup createReviewGroup();
-
-	/**
-	 * Returns a new object of class '<em>Topic</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Topic</em>'.
-	 * @generated
-	 */
-	Topic createTopic();
-
-	/**
-	 * Returns a new object of class '<em>Review Component</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Review Component</em>'.
-	 * @generated
-	 */
-	ReviewComponent createReviewComponent();
-
-	/**
-	 * Returns a new object of class '<em>Sub Model Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Sub Model Root</em>'.
-	 * @generated
-	 */
-	SubModelRoot createSubModelRoot();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ModelPackage getModelPackage();
-
-} //ModelFactory
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ModelPackage.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ModelPackage.java
deleted file mode 100644
index e5aab0fa..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ModelPackage.java
+++ /dev/null
@@ -1,1405 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelFactory
- * @model kind="package"
- * @generated
- */
-public interface ModelPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "model";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://org.eclipse.mylyn.reviews.frame.core.model/1.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.mylyn.reviews.frame.core";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ModelPackage eINSTANCE = org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl <em>Review Component</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getReviewComponent()
-	 * @generated
-	 */
-	int REVIEW_COMPONENT = 10;
-
-	/**
-	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_COMPONENT__ENABLED = 0;
-
-	/**
-	 * The number of structural features of the '<em>Review Component</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_COMPONENT_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl <em>Review</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getReview()
-	 * @generated
-	 */
-	int REVIEW = 0;
-
-	/**
-	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__ENABLED = REVIEW_COMPONENT__ENABLED;
-
-	/**
-	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__FRAGMENT_VERSION = REVIEW_COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__COMPATIBILITY = REVIEW_COMPONENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Application Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__APPLICATION_VERSION = REVIEW_COMPONENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Topics</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__TOPICS = REVIEW_COMPONENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Review Items</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__REVIEW_ITEMS = REVIEW_COMPONENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Review Task</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__REVIEW_TASK = REVIEW_COMPONENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>State</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW__STATE = REVIEW_COMPONENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Review</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_FEATURE_COUNT = REVIEW_COMPONENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.CommentImpl <em>Comment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.CommentImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getComment()
-	 * @generated
-	 */
-	int COMMENT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT__ENABLED = REVIEW_COMPONENT__ENABLED;
-
-	/**
-	 * The feature id for the '<em><b>User</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT__USER = REVIEW_COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT__TYPE = REVIEW_COMPONENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT__DESCRIPTION = REVIEW_COMPONENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT_FEATURE_COUNT = REVIEW_COMPONENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ItemImpl <em>Item</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ItemImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getItem()
-	 * @generated
-	 */
-	int ITEM = 2;
-
-	/**
-	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITEM__ENABLED = REVIEW_COMPONENT__ENABLED;
-
-	/**
-	 * The feature id for the '<em><b>Added By</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITEM__ADDED_BY = REVIEW_COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Review</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITEM__REVIEW = REVIEW_COMPONENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Item</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITEM_FEATURE_COUNT = REVIEW_COMPONENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.LocationImpl <em>Location</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.LocationImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getLocation()
-	 * @generated
-	 */
-	int LOCATION = 3;
-
-	/**
-	 * The number of structural features of the '<em>Location</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCATION_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.UserImpl <em>User</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.UserImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getUser()
-	 * @generated
-	 */
-	int USER = 4;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER__ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Email</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER__EMAIL = 1;
-
-	/**
-	 * The number of structural features of the '<em>User</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TaskReferenceImpl <em>Task Reference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.TaskReferenceImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getTaskReference()
-	 * @generated
-	 */
-	int TASK_REFERENCE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_REFERENCE__ENABLED = REVIEW_COMPONENT__ENABLED;
-
-	/**
-	 * The feature id for the '<em><b>Task Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_REFERENCE__TASK_ID = REVIEW_COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Repository URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_REFERENCE__REPOSITORY_URL = REVIEW_COMPONENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Task Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TASK_REFERENCE_FEATURE_COUNT = REVIEW_COMPONENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewStateImpl <em>Review State</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewStateImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getReviewState()
-	 * @generated
-	 */
-	int REVIEW_STATE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_STATE__ENABLED = REVIEW_COMPONENT__ENABLED;
-
-	/**
-	 * The number of structural features of the '<em>Review State</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_STATE_FEATURE_COUNT = REVIEW_COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl <em>Review Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getReviewGroup()
-	 * @generated
-	 */
-	int REVIEW_GROUP = 7;
-
-	/**
-	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP__ENABLED = REVIEW_COMPONENT__ENABLED;
-
-	/**
-	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP__FRAGMENT_VERSION = REVIEW_COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP__COMPATIBILITY = REVIEW_COMPONENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Application Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP__APPLICATION_VERSION = REVIEW_COMPONENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Reviews</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP__REVIEWS = REVIEW_COMPONENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Review Group Task</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP__REVIEW_GROUP_TASK = REVIEW_COMPONENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP__DESCRIPTION = REVIEW_COMPONENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Review Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP_FEATURE_COUNT = REVIEW_COMPONENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.CommentTypeImpl <em>Comment Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.CommentTypeImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getCommentType()
-	 * @generated
-	 */
-	int COMMENT_TYPE = 8;
-
-	/**
-	 * The number of structural features of the '<em>Comment Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT_TYPE_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl <em>Topic</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getTopic()
-	 * @generated
-	 */
-	int TOPIC = 9;
-
-	/**
-	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__ENABLED = COMMENT__ENABLED;
-
-	/**
-	 * The feature id for the '<em><b>User</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__USER = COMMENT__USER;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__TYPE = COMMENT__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__DESCRIPTION = COMMENT__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Task</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__TASK = COMMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__LOCATION = COMMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Comments</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__COMMENTS = COMMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Review</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__REVIEW = COMMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC__TITLE = COMMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Topic</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOPIC_FEATURE_COUNT = COMMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.SubModelRootImpl <em>Sub Model Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.SubModelRootImpl
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getSubModelRoot()
-	 * @generated
-	 */
-	int SUB_MODEL_ROOT = 11;
-
-	/**
-	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUB_MODEL_ROOT__FRAGMENT_VERSION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUB_MODEL_ROOT__COMPATIBILITY = 1;
-
-	/**
-	 * The feature id for the '<em><b>Application Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUB_MODEL_ROOT__APPLICATION_VERSION = 2;
-
-	/**
-	 * The number of structural features of the '<em>Sub Model Root</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SUB_MODEL_ROOT_FEATURE_COUNT = 3;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.Review <em>Review</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Review</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Review
-	 * @generated
-	 */
-	EClass getReview();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getTopics <em>Topics</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Topics</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Review#getTopics()
-	 * @see #getReview()
-	 * @generated
-	 */
-	EReference getReview_Topics();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getReviewItems <em>Review Items</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Review Items</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Review#getReviewItems()
-	 * @see #getReview()
-	 * @generated
-	 */
-	EReference getReview_ReviewItems();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getReviewTask <em>Review Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Review Task</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Review#getReviewTask()
-	 * @see #getReview()
-	 * @generated
-	 */
-	EReference getReview_ReviewTask();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getState <em>State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>State</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Review#getState()
-	 * @see #getReview()
-	 * @generated
-	 */
-	EReference getReview_State();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment <em>Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Comment</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Comment
-	 * @generated
-	 */
-	EClass getComment();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getUser <em>User</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>User</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Comment#getUser()
-	 * @see #getComment()
-	 * @generated
-	 */
-	EReference getComment_User();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Type</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Comment#getType()
-	 * @see #getComment()
-	 * @generated
-	 */
-	EReference getComment_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Comment#getDescription()
-	 * @see #getComment()
-	 * @generated
-	 */
-	EAttribute getComment_Description();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.Item <em>Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Item</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Item
-	 * @generated
-	 */
-	EClass getItem();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.mylyn.reviews.frame.core.model.Item#getAddedBy <em>Added By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Added By</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Item#getAddedBy()
-	 * @see #getItem()
-	 * @generated
-	 */
-	EReference getItem_AddedBy();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.mylyn.reviews.frame.core.model.Item#getReview <em>Review</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Review</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Item#getReview()
-	 * @see #getItem()
-	 * @generated
-	 */
-	EReference getItem_Review();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.Location <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Location</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Location
-	 * @generated
-	 */
-	EClass getLocation();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.User <em>User</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>User</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.User
-	 * @generated
-	 */
-	EClass getUser();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.User#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.User#getId()
-	 * @see #getUser()
-	 * @generated
-	 */
-	EAttribute getUser_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.User#getEmail <em>Email</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Email</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.User#getEmail()
-	 * @see #getUser()
-	 * @generated
-	 */
-	EAttribute getUser_Email();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference <em>Task Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Task Reference</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.TaskReference
-	 * @generated
-	 */
-	EClass getTaskReference();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference#getTaskId <em>Task Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Task Id</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.TaskReference#getTaskId()
-	 * @see #getTaskReference()
-	 * @generated
-	 */
-	EAttribute getTaskReference_TaskId();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference#getRepositoryURL <em>Repository URL</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Repository URL</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.TaskReference#getRepositoryURL()
-	 * @see #getTaskReference()
-	 * @generated
-	 */
-	EAttribute getTaskReference_RepositoryURL();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewState <em>Review State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Review State</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewState
-	 * @generated
-	 */
-	EClass getReviewState();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup <em>Review Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Review Group</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup
-	 * @generated
-	 */
-	EClass getReviewGroup();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getReviews <em>Reviews</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Reviews</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getReviews()
-	 * @see #getReviewGroup()
-	 * @generated
-	 */
-	EReference getReviewGroup_Reviews();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getReviewGroupTask <em>Review Group Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Review Group Task</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getReviewGroupTask()
-	 * @see #getReviewGroup()
-	 * @generated
-	 */
-	EReference getReviewGroup_ReviewGroupTask();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getDescription()
-	 * @see #getReviewGroup()
-	 * @generated
-	 */
-	EAttribute getReviewGroup_Description();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.CommentType <em>Comment Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Comment Type</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.CommentType
-	 * @generated
-	 */
-	EClass getCommentType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic <em>Topic</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Topic</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Topic
-	 * @generated
-	 */
-	EClass getTopic();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getTask <em>Task</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Task</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Topic#getTask()
-	 * @see #getTopic()
-	 * @generated
-	 */
-	EReference getTopic_Task();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getLocation <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Location</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Topic#getLocation()
-	 * @see #getTopic()
-	 * @generated
-	 */
-	EReference getTopic_Location();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getComments <em>Comments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Comments</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Topic#getComments()
-	 * @see #getTopic()
-	 * @generated
-	 */
-	EReference getTopic_Comments();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getReview <em>Review</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Review</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Topic#getReview()
-	 * @see #getTopic()
-	 * @generated
-	 */
-	EReference getTopic_Review();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Title</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Topic#getTitle()
-	 * @see #getTopic()
-	 * @generated
-	 */
-	EAttribute getTopic_Title();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent <em>Review Component</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Review Component</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent
-	 * @generated
-	 */
-	EClass getReviewComponent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent#isEnabled <em>Enabled</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Enabled</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent#isEnabled()
-	 * @see #getReviewComponent()
-	 * @generated
-	 */
-	EAttribute getReviewComponent_Enabled();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot <em>Sub Model Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Sub Model Root</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot
-	 * @generated
-	 */
-	EClass getSubModelRoot();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getFragmentVersion <em>Fragment Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fragment Version</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getFragmentVersion()
-	 * @see #getSubModelRoot()
-	 * @generated
-	 */
-	EAttribute getSubModelRoot_FragmentVersion();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getCompatibility <em>Compatibility</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Compatibility</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getCompatibility()
-	 * @see #getSubModelRoot()
-	 * @generated
-	 */
-	EAttribute getSubModelRoot_Compatibility();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getApplicationVersion <em>Application Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Application Version</em>'.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getApplicationVersion()
-	 * @see #getSubModelRoot()
-	 * @generated
-	 */
-	EAttribute getSubModelRoot_ApplicationVersion();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ModelFactory getModelFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl <em>Review</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getReview()
-		 * @generated
-		 */
-		EClass REVIEW = eINSTANCE.getReview();
-
-		/**
-		 * The meta object literal for the '<em><b>Topics</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REVIEW__TOPICS = eINSTANCE.getReview_Topics();
-
-		/**
-		 * The meta object literal for the '<em><b>Review Items</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REVIEW__REVIEW_ITEMS = eINSTANCE.getReview_ReviewItems();
-
-		/**
-		 * The meta object literal for the '<em><b>Review Task</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REVIEW__REVIEW_TASK = eINSTANCE.getReview_ReviewTask();
-
-		/**
-		 * The meta object literal for the '<em><b>State</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REVIEW__STATE = eINSTANCE.getReview_State();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.CommentImpl <em>Comment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.CommentImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getComment()
-		 * @generated
-		 */
-		EClass COMMENT = eINSTANCE.getComment();
-
-		/**
-		 * The meta object literal for the '<em><b>User</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference COMMENT__USER = eINSTANCE.getComment_User();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference COMMENT__TYPE = eINSTANCE.getComment_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COMMENT__DESCRIPTION = eINSTANCE.getComment_Description();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ItemImpl <em>Item</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ItemImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getItem()
-		 * @generated
-		 */
-		EClass ITEM = eINSTANCE.getItem();
-
-		/**
-		 * The meta object literal for the '<em><b>Added By</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ITEM__ADDED_BY = eINSTANCE.getItem_AddedBy();
-
-		/**
-		 * The meta object literal for the '<em><b>Review</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ITEM__REVIEW = eINSTANCE.getItem_Review();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.LocationImpl <em>Location</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.LocationImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getLocation()
-		 * @generated
-		 */
-		EClass LOCATION = eINSTANCE.getLocation();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.UserImpl <em>User</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.UserImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getUser()
-		 * @generated
-		 */
-		EClass USER = eINSTANCE.getUser();
-
-		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER__ID = eINSTANCE.getUser_Id();
-
-		/**
-		 * The meta object literal for the '<em><b>Email</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USER__EMAIL = eINSTANCE.getUser_Email();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TaskReferenceImpl <em>Task Reference</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.TaskReferenceImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getTaskReference()
-		 * @generated
-		 */
-		EClass TASK_REFERENCE = eINSTANCE.getTaskReference();
-
-		/**
-		 * The meta object literal for the '<em><b>Task Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_REFERENCE__TASK_ID = eINSTANCE.getTaskReference_TaskId();
-
-		/**
-		 * The meta object literal for the '<em><b>Repository URL</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TASK_REFERENCE__REPOSITORY_URL = eINSTANCE.getTaskReference_RepositoryURL();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewStateImpl <em>Review State</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewStateImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getReviewState()
-		 * @generated
-		 */
-		EClass REVIEW_STATE = eINSTANCE.getReviewState();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl <em>Review Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getReviewGroup()
-		 * @generated
-		 */
-		EClass REVIEW_GROUP = eINSTANCE.getReviewGroup();
-
-		/**
-		 * The meta object literal for the '<em><b>Reviews</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REVIEW_GROUP__REVIEWS = eINSTANCE.getReviewGroup_Reviews();
-
-		/**
-		 * The meta object literal for the '<em><b>Review Group Task</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference REVIEW_GROUP__REVIEW_GROUP_TASK = eINSTANCE.getReviewGroup_ReviewGroupTask();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REVIEW_GROUP__DESCRIPTION = eINSTANCE.getReviewGroup_Description();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.CommentTypeImpl <em>Comment Type</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.CommentTypeImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getCommentType()
-		 * @generated
-		 */
-		EClass COMMENT_TYPE = eINSTANCE.getCommentType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl <em>Topic</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getTopic()
-		 * @generated
-		 */
-		EClass TOPIC = eINSTANCE.getTopic();
-
-		/**
-		 * The meta object literal for the '<em><b>Task</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TOPIC__TASK = eINSTANCE.getTopic_Task();
-
-		/**
-		 * The meta object literal for the '<em><b>Location</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TOPIC__LOCATION = eINSTANCE.getTopic_Location();
-
-		/**
-		 * The meta object literal for the '<em><b>Comments</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TOPIC__COMMENTS = eINSTANCE.getTopic_Comments();
-
-		/**
-		 * The meta object literal for the '<em><b>Review</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TOPIC__REVIEW = eINSTANCE.getTopic_Review();
-
-		/**
-		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TOPIC__TITLE = eINSTANCE.getTopic_Title();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl <em>Review Component</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getReviewComponent()
-		 * @generated
-		 */
-		EClass REVIEW_COMPONENT = eINSTANCE.getReviewComponent();
-
-		/**
-		 * The meta object literal for the '<em><b>Enabled</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REVIEW_COMPONENT__ENABLED = eINSTANCE.getReviewComponent_Enabled();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.frame.core.model.impl.SubModelRootImpl <em>Sub Model Root</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.SubModelRootImpl
-		 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ModelPackageImpl#getSubModelRoot()
-		 * @generated
-		 */
-		EClass SUB_MODEL_ROOT = eINSTANCE.getSubModelRoot();
-
-		/**
-		 * The meta object literal for the '<em><b>Fragment Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SUB_MODEL_ROOT__FRAGMENT_VERSION = eINSTANCE.getSubModelRoot_FragmentVersion();
-
-		/**
-		 * The meta object literal for the '<em><b>Compatibility</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SUB_MODEL_ROOT__COMPATIBILITY = eINSTANCE.getSubModelRoot_Compatibility();
-
-		/**
-		 * The meta object literal for the '<em><b>Application Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SUB_MODEL_ROOT__APPLICATION_VERSION = eINSTANCE.getSubModelRoot_ApplicationVersion();
-
-	}
-
-} //ModelPackage
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Review.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Review.java
deleted file mode 100644
index 6ee8a8bc..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Review.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Review</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getTopics <em>Topics</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getReviewItems <em>Review Items</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getReviewTask <em>Review Task</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getState <em>State</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReview()
- * @model
- * @generated
- */
-public interface Review extends ReviewComponent, SubModelRoot {
-	/**
-	 * Returns the value of the '<em><b>Topics</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.mylyn.reviews.frame.core.model.Topic}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Topics</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Topics</em>' reference list.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReview_Topics()
-	 * @model transient="true" derived="true"
-	 * @generated
-	 */
-	EList<Topic> getTopics();
-
-	/**
-	 * Returns the value of the '<em><b>Review Items</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.mylyn.reviews.frame.core.model.Item}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Review Items</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Review Items</em>' reference list.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReview_ReviewItems()
-	 * @model transient="true" derived="true"
-	 * @generated
-	 */
-	EList<Item> getReviewItems();
-
-	/**
-	 * Returns the value of the '<em><b>Review Task</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Review Task</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Review Task</em>' containment reference.
-	 * @see #setReviewTask(TaskReference)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReview_ReviewTask()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	TaskReference getReviewTask();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getReviewTask <em>Review Task</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Review Task</em>' containment reference.
-	 * @see #getReviewTask()
-	 * @generated
-	 */
-	void setReviewTask(TaskReference value);
-
-	/**
-	 * Returns the value of the '<em><b>State</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>State</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>State</em>' containment reference.
-	 * @see #setState(ReviewState)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReview_State()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
-	ReviewState getState();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Review#getState <em>State</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>State</em>' containment reference.
-	 * @see #getState()
-	 * @generated
-	 */
-	void setState(ReviewState value);
-
-} // Review
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewComponent.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewComponent.java
deleted file mode 100644
index 3e5b6501..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewComponent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Review Component</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent#isEnabled <em>Enabled</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReviewComponent()
- * @model
- * @generated
- */
-public interface ReviewComponent extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Enabled</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Enabled</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Enabled</em>' attribute.
-	 * @see #setEnabled(boolean)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReviewComponent_Enabled()
-	 * @model default="true" id="true"
-	 *        extendedMetaData="namespace='' wildcards='' name=''"
-	 * @generated
-	 */
-	boolean isEnabled();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent#isEnabled <em>Enabled</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Enabled</em>' attribute.
-	 * @see #isEnabled()
-	 * @generated
-	 */
-	void setEnabled(boolean value);
-
-} // ReviewComponent
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewGroup.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewGroup.java
deleted file mode 100644
index f8b11e95..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewGroup.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Review Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getReviews <em>Reviews</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getReviewGroupTask <em>Review Group Task</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReviewGroup()
- * @model
- * @generated
- */
-public interface ReviewGroup extends ReviewComponent, SubModelRoot {
-	/**
-	 * Returns the value of the '<em><b>Reviews</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.mylyn.reviews.frame.core.model.Review}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reviews</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Reviews</em>' containment reference list.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReviewGroup_Reviews()
-	 * @model containment="true" resolveProxies="true" transient="true" derived="true"
-	 * @generated
-	 */
-	EList<Review> getReviews();
-
-	/**
-	 * Returns the value of the '<em><b>Review Group Task</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Review Group Task</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Review Group Task</em>' containment reference.
-	 * @see #setReviewGroupTask(TaskReference)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReviewGroup_ReviewGroupTask()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	TaskReference getReviewGroupTask();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getReviewGroupTask <em>Review Group Task</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Review Group Task</em>' containment reference.
-	 * @see #getReviewGroupTask()
-	 * @generated
-	 */
-	void setReviewGroupTask(TaskReference value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReviewGroup_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-} // ReviewGroup
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewState.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewState.java
deleted file mode 100644
index 86298591..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/ReviewState.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Review State</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getReviewState()
- * @model abstract="true"
- * @generated
- */
-public interface ReviewState extends ReviewComponent {
-
-} // ReviewState
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/SubModelRoot.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/SubModelRoot.java
deleted file mode 100644
index a3dc4ea8..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/SubModelRoot.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Sub Model Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getFragmentVersion <em>Fragment Version</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getCompatibility <em>Compatibility</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getApplicationVersion <em>Application Version</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getSubModelRoot()
- * @model
- * @generated
- */
-public interface SubModelRoot extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Fragment Version</b></em>' attribute.
-	 * The default value is <code>"0.8.0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fragment Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fragment Version</em>' attribute.
-	 * @see #setFragmentVersion(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getSubModelRoot_FragmentVersion()
-	 * @model default="0.8.0"
-	 * @generated
-	 */
-	String getFragmentVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getFragmentVersion <em>Fragment Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fragment Version</em>' attribute.
-	 * @see #getFragmentVersion()
-	 * @generated
-	 */
-	void setFragmentVersion(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Compatibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * Returns:</br>-1 : The current application has a lower data structure revision than this instance</br> 0 : The
-	 * current application has the same data structure revision than this instance</br>+1 : The current application has
-	 * a higher data structure revision than this instance</br>
-	 * 
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Compatibility</em>' attribute.
-	 * @see #isSetCompatibility()
-	 * @see #unsetCompatibility()
-	 * @see #setCompatibility(int)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getSubModelRoot_Compatibility()
-	 * @model unsettable="true" transient="true" derived="true"
-	 * @generated
-	 */
-	int getCompatibility();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getCompatibility <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Compatibility</em>' attribute.
-	 * @see #isSetCompatibility()
-	 * @see #unsetCompatibility()
-	 * @see #getCompatibility()
-	 * @generated
-	 */
-	void setCompatibility(int value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getCompatibility <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetCompatibility()
-	 * @see #getCompatibility()
-	 * @see #setCompatibility(int)
-	 * @generated
-	 */
-	void unsetCompatibility();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getCompatibility <em>Compatibility</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Compatibility</em>' attribute is set.
-	 * @see #unsetCompatibility()
-	 * @see #getCompatibility()
-	 * @see #setCompatibility(int)
-	 * @generated
-	 */
-	boolean isSetCompatibility();
-
-	/**
-	 * Returns the value of the '<em><b>Application Version</b></em>' attribute.
-	 * The default value is <code>"1.0.0"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Application Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Application Version</em>' attribute.
-	 * @see #isSetApplicationVersion()
-	 * @see #unsetApplicationVersion()
-	 * @see #setApplicationVersion(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getSubModelRoot_ApplicationVersion()
-	 * @model default="1.0.0" unsettable="true" transient="true" derived="true"
-	 * @generated
-	 */
-	String getApplicationVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getApplicationVersion <em>Application Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Application Version</em>' attribute.
-	 * @see #isSetApplicationVersion()
-	 * @see #unsetApplicationVersion()
-	 * @see #getApplicationVersion()
-	 * @generated
-	 */
-	void setApplicationVersion(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getApplicationVersion <em>Application Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetApplicationVersion()
-	 * @see #getApplicationVersion()
-	 * @see #setApplicationVersion(String)
-	 * @generated
-	 */
-	void unsetApplicationVersion();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getApplicationVersion <em>Application Version</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Application Version</em>' attribute is set.
-	 * @see #unsetApplicationVersion()
-	 * @see #getApplicationVersion()
-	 * @see #setApplicationVersion(String)
-	 * @generated
-	 */
-	boolean isSetApplicationVersion();
-
-} // SubModelRoot
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/TaskReference.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/TaskReference.java
deleted file mode 100644
index ae73f253..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/TaskReference.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Task Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference#getTaskId <em>Task Id</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference#getRepositoryURL <em>Repository URL</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTaskReference()
- * @model
- * @generated
- */
-public interface TaskReference extends ReviewComponent {
-	/**
-	 * Returns the value of the '<em><b>Task Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Task Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Task Id</em>' attribute.
-	 * @see #setTaskId(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTaskReference_TaskId()
-	 * @model
-	 * @generated
-	 */
-	String getTaskId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference#getTaskId <em>Task Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Task Id</em>' attribute.
-	 * @see #getTaskId()
-	 * @generated
-	 */
-	void setTaskId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Repository URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Repository URL</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Repository URL</em>' attribute.
-	 * @see #setRepositoryURL(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTaskReference_RepositoryURL()
-	 * @model
-	 * @generated
-	 */
-	String getRepositoryURL();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference#getRepositoryURL <em>Repository URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Repository URL</em>' attribute.
-	 * @see #getRepositoryURL()
-	 * @generated
-	 */
-	void setRepositoryURL(String value);
-
-} // TaskReference
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Topic.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Topic.java
deleted file mode 100644
index 5279863b..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/Topic.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Topic</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getTask <em>Task</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getComments <em>Comments</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getReview <em>Review</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getTitle <em>Title</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTopic()
- * @model
- * @generated
- */
-public interface Topic extends Comment {
-	/**
-	 * Returns the value of the '<em><b>Task</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Task</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Task</em>' containment reference.
-	 * @see #setTask(TaskReference)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTopic_Task()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	TaskReference getTask();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getTask <em>Task</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Task</em>' containment reference.
-	 * @see #getTask()
-	 * @generated
-	 */
-	void setTask(TaskReference value);
-
-	/**
-	 * Returns the value of the '<em><b>Location</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.mylyn.reviews.frame.core.model.Location}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Location</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Location</em>' containment reference list.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTopic_Location()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<Location> getLocation();
-
-	/**
-	 * Returns the value of the '<em><b>Comments</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.mylyn.reviews.frame.core.model.Comment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comments</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Comments</em>' reference list.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTopic_Comments()
-	 * @model transient="true" derived="true"
-	 * @generated
-	 */
-	EList<Comment> getComments();
-
-	/**
-	 * Returns the value of the '<em><b>Review</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Review</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Review</em>' reference.
-	 * @see #setReview(Review)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTopic_Review()
-	 * @model required="true"
-	 * @generated
-	 */
-	Review getReview();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getReview <em>Review</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Review</em>' reference.
-	 * @see #getReview()
-	 * @generated
-	 */
-	void setReview(Review value);
-
-	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Title</em>' attribute.
-	 * @see #setTitle(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getTopic_Title()
-	 * @model
-	 * @generated
-	 */
-	String getTitle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
-	 * @see #getTitle()
-	 * @generated
-	 */
-	void setTitle(String value);
-
-} // Topic
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/User.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/User.java
deleted file mode 100644
index eff6de0d..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/User.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>User</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.User#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.User#getEmail <em>Email</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getUser()
- * @model
- * @generated
- */
-public interface User extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getUser_Id()
-	 * @model
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.User#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Email</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Email</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Email</em>' attribute.
-	 * @see #setEmail(String)
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#getUser_Email()
-	 * @model
-	 * @generated
-	 */
-	String getEmail();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.frame.core.model.User#getEmail <em>Email</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Email</em>' attribute.
-	 * @see #getEmail()
-	 * @generated
-	 */
-	void setEmail(String value);
-
-} // User
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/CommentImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/CommentImpl.java
deleted file mode 100644
index ff199ae7..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/CommentImpl.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Comment</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.CommentImpl#getUser <em>User</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.CommentImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.CommentImpl#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CommentImpl extends ReviewComponentImpl implements Comment {
-	/**
-	 * The cached value of the '{@link #getUser() <em>User</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUser()
-	 * @generated
-	 * @ordered
-	 */
-	protected User user;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected CommentType type;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CommentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.COMMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public User getUser() {
-		return user;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUser(User newUser) {
-		User oldUser = user;
-		user = newUser;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.COMMENT__USER, oldUser, user));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommentType getType() {
-		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (CommentType)eResolveProxy(oldType);
-			if (type != oldType) {
-				InternalEObject newType = (InternalEObject)type;
-				NotificationChain msgs = oldType.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.COMMENT__TYPE, null, null);
-				if (newType.eInternalContainer() == null) {
-					msgs = newType.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.COMMENT__TYPE, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.COMMENT__TYPE, oldType, type));
-			}
-		}
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommentType basicGetType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetType(CommentType newType, NotificationChain msgs) {
-		CommentType oldType = type;
-		type = newType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackage.COMMENT__TYPE, oldType, newType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(CommentType newType) {
-		if (newType != type) {
-			NotificationChain msgs = null;
-			if (type != null)
-				msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.COMMENT__TYPE, null, msgs);
-			if (newType != null)
-				msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.COMMENT__TYPE, null, msgs);
-			msgs = basicSetType(newType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.COMMENT__TYPE, newType, newType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description!= null ? description : "";
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.COMMENT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.COMMENT__TYPE:
-				return basicSetType(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.COMMENT__USER:
-				return getUser();
-			case ModelPackage.COMMENT__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case ModelPackage.COMMENT__DESCRIPTION:
-				return getDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.COMMENT__USER:
-				setUser((User)newValue);
-				return;
-			case ModelPackage.COMMENT__TYPE:
-				setType((CommentType)newValue);
-				return;
-			case ModelPackage.COMMENT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.COMMENT__USER:
-				setUser((User)null);
-				return;
-			case ModelPackage.COMMENT__TYPE:
-				setType((CommentType)null);
-				return;
-			case ModelPackage.COMMENT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.COMMENT__USER:
-				return user != null;
-			case ModelPackage.COMMENT__TYPE:
-				return type != null;
-			case ModelPackage.COMMENT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CommentImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/CommentTypeImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/CommentTypeImpl.java
deleted file mode 100644
index 799fd759..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/CommentTypeImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Comment Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class CommentTypeImpl extends EObjectImpl implements CommentType {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CommentTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.COMMENT_TYPE;
-	}
-
-} //CommentTypeImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ItemImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ItemImpl.java
deleted file mode 100644
index c40d3d5d..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ItemImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Item</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ItemImpl#getAddedBy <em>Added By</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ItemImpl#getReview <em>Review</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ItemImpl extends ReviewComponentImpl implements Item {
-	/**
-	 * The cached value of the '{@link #getAddedBy() <em>Added By</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected User addedBy;
-	/**
-	 * The cached value of the '{@link #getReview() <em>Review</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReview()
-	 * @generated
-	 * @ordered
-	 */
-	protected Review review;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ItemImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.ITEM;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public User getAddedBy() {
-		if (addedBy != null && addedBy.eIsProxy()) {
-			InternalEObject oldAddedBy = (InternalEObject)addedBy;
-			addedBy = (User)eResolveProxy(oldAddedBy);
-			if (addedBy != oldAddedBy) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.ITEM__ADDED_BY, oldAddedBy, addedBy));
-			}
-		}
-		return addedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public User basicGetAddedBy() {
-		return addedBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAddedBy(User newAddedBy) {
-		User oldAddedBy = addedBy;
-		addedBy = newAddedBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.ITEM__ADDED_BY, oldAddedBy, addedBy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Review getReview() {
-		if (review != null && review.eIsProxy()) {
-			InternalEObject oldReview = (InternalEObject)review;
-			review = (Review)eResolveProxy(oldReview);
-			if (review != oldReview) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.ITEM__REVIEW, oldReview, review));
-			}
-		}
-		return review;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Review basicGetReview() {
-		return review;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReview(Review newReview) {
-		Review oldReview = review;
-		review = newReview;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.ITEM__REVIEW, oldReview, review));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.ITEM__ADDED_BY:
-				if (resolve) return getAddedBy();
-				return basicGetAddedBy();
-			case ModelPackage.ITEM__REVIEW:
-				if (resolve) return getReview();
-				return basicGetReview();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.ITEM__ADDED_BY:
-				setAddedBy((User)newValue);
-				return;
-			case ModelPackage.ITEM__REVIEW:
-				setReview((Review)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.ITEM__ADDED_BY:
-				setAddedBy((User)null);
-				return;
-			case ModelPackage.ITEM__REVIEW:
-				setReview((Review)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.ITEM__ADDED_BY:
-				return addedBy != null;
-			case ModelPackage.ITEM__REVIEW:
-				return review != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ItemImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/LocationImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/LocationImpl.java
deleted file mode 100644
index 195ef2bc..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/LocationImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Location</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class LocationImpl extends EObjectImpl implements Location {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.LOCATION;
-	}
-
-} //LocationImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ModelFactoryImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ModelFactoryImpl.java
deleted file mode 100644
index 7520cebf..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ModelFactoryImpl.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.mylyn.reviews.frame.core.model.*;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelFactory;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ModelFactory init() {
-		try {
-			ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.mylyn.reviews.frame.core.model/1.0"); 
-			if (theModelFactory != null) {
-				return theModelFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ModelFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ModelPackage.REVIEW: return createReview();
-			case ModelPackage.COMMENT: return createComment();
-			case ModelPackage.ITEM: return createItem();
-			case ModelPackage.USER: return createUser();
-			case ModelPackage.TASK_REFERENCE: return createTaskReference();
-			case ModelPackage.REVIEW_GROUP: return createReviewGroup();
-			case ModelPackage.TOPIC: return createTopic();
-			case ModelPackage.REVIEW_COMPONENT: return createReviewComponent();
-			case ModelPackage.SUB_MODEL_ROOT: return createSubModelRoot();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Review createReview() {
-		ReviewImpl review = new ReviewImpl();
-		return review;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Comment createComment() {
-		CommentImpl comment = new CommentImpl();
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Item createItem() {
-		ItemImpl item = new ItemImpl();
-		return item;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public User createUser() {
-		UserImpl user = new UserImpl();
-		return user;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskReference createTaskReference() {
-		TaskReferenceImpl taskReference = new TaskReferenceImpl();
-		return taskReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewGroup createReviewGroup() {
-		ReviewGroupImpl reviewGroup = new ReviewGroupImpl();
-		return reviewGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Topic createTopic() {
-		TopicImpl topic = new TopicImpl();
-		return topic;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewComponent createReviewComponent() {
-		ReviewComponentImpl reviewComponent = new ReviewComponentImpl();
-		return reviewComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SubModelRoot createSubModelRoot() {
-		SubModelRootImpl subModelRoot = new SubModelRootImpl();
-		return subModelRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelPackage getModelPackage() {
-		return (ModelPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ModelPackage getPackage() {
-		return ModelPackage.eINSTANCE;
-	}
-
-} //ModelFactoryImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ModelPackageImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ModelPackageImpl.java
deleted file mode 100644
index 5df9a54a..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ModelPackageImpl.java
+++ /dev/null
@@ -1,713 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelFactory;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reviewEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass commentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass itemEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass locationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass userEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass taskReferenceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reviewStateEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reviewGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass commentTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass topicEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass reviewComponentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass subModelRootEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ModelPackageImpl() {
-		super(eNS_URI, ModelFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ModelPackage init() {
-		if (isInited) return (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ModelPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theModelPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theModelPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theModelPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ModelPackage.eNS_URI, theModelPackage);
-		return theModelPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReview() {
-		return reviewEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReview_Topics() {
-		return (EReference)reviewEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReview_ReviewItems() {
-		return (EReference)reviewEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReview_ReviewTask() {
-		return (EReference)reviewEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReview_State() {
-		return (EReference)reviewEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getComment() {
-		return commentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getComment_User() {
-		return (EReference)commentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getComment_Type() {
-		return (EReference)commentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getComment_Description() {
-		return (EAttribute)commentEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getItem() {
-		return itemEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getItem_AddedBy() {
-		return (EReference)itemEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getItem_Review() {
-		return (EReference)itemEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocation() {
-		return locationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getUser() {
-		return userEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUser_Id() {
-		return (EAttribute)userEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getUser_Email() {
-		return (EAttribute)userEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTaskReference() {
-		return taskReferenceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskReference_TaskId() {
-		return (EAttribute)taskReferenceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTaskReference_RepositoryURL() {
-		return (EAttribute)taskReferenceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReviewState() {
-		return reviewStateEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReviewGroup() {
-		return reviewGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReviewGroup_Reviews() {
-		return (EReference)reviewGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReviewGroup_ReviewGroupTask() {
-		return (EReference)reviewGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getReviewGroup_Description() {
-		return (EAttribute)reviewGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCommentType() {
-		return commentTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTopic() {
-		return topicEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTopic_Task() {
-		return (EReference)topicEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTopic_Location() {
-		return (EReference)topicEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTopic_Comments() {
-		return (EReference)topicEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTopic_Review() {
-		return (EReference)topicEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTopic_Title() {
-		return (EAttribute)topicEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReviewComponent() {
-		return reviewComponentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getReviewComponent_Enabled() {
-		return (EAttribute)reviewComponentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSubModelRoot() {
-		return subModelRootEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSubModelRoot_FragmentVersion() {
-		return (EAttribute)subModelRootEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSubModelRoot_Compatibility() {
-		return (EAttribute)subModelRootEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSubModelRoot_ApplicationVersion() {
-		return (EAttribute)subModelRootEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelFactory getModelFactory() {
-		return (ModelFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		reviewEClass = createEClass(REVIEW);
-		createEReference(reviewEClass, REVIEW__TOPICS);
-		createEReference(reviewEClass, REVIEW__REVIEW_ITEMS);
-		createEReference(reviewEClass, REVIEW__REVIEW_TASK);
-		createEReference(reviewEClass, REVIEW__STATE);
-
-		commentEClass = createEClass(COMMENT);
-		createEReference(commentEClass, COMMENT__USER);
-		createEReference(commentEClass, COMMENT__TYPE);
-		createEAttribute(commentEClass, COMMENT__DESCRIPTION);
-
-		itemEClass = createEClass(ITEM);
-		createEReference(itemEClass, ITEM__ADDED_BY);
-		createEReference(itemEClass, ITEM__REVIEW);
-
-		locationEClass = createEClass(LOCATION);
-
-		userEClass = createEClass(USER);
-		createEAttribute(userEClass, USER__ID);
-		createEAttribute(userEClass, USER__EMAIL);
-
-		taskReferenceEClass = createEClass(TASK_REFERENCE);
-		createEAttribute(taskReferenceEClass, TASK_REFERENCE__TASK_ID);
-		createEAttribute(taskReferenceEClass, TASK_REFERENCE__REPOSITORY_URL);
-
-		reviewStateEClass = createEClass(REVIEW_STATE);
-
-		reviewGroupEClass = createEClass(REVIEW_GROUP);
-		createEReference(reviewGroupEClass, REVIEW_GROUP__REVIEWS);
-		createEReference(reviewGroupEClass, REVIEW_GROUP__REVIEW_GROUP_TASK);
-		createEAttribute(reviewGroupEClass, REVIEW_GROUP__DESCRIPTION);
-
-		commentTypeEClass = createEClass(COMMENT_TYPE);
-
-		topicEClass = createEClass(TOPIC);
-		createEReference(topicEClass, TOPIC__TASK);
-		createEReference(topicEClass, TOPIC__LOCATION);
-		createEReference(topicEClass, TOPIC__COMMENTS);
-		createEReference(topicEClass, TOPIC__REVIEW);
-		createEAttribute(topicEClass, TOPIC__TITLE);
-
-		reviewComponentEClass = createEClass(REVIEW_COMPONENT);
-		createEAttribute(reviewComponentEClass, REVIEW_COMPONENT__ENABLED);
-
-		subModelRootEClass = createEClass(SUB_MODEL_ROOT);
-		createEAttribute(subModelRootEClass, SUB_MODEL_ROOT__FRAGMENT_VERSION);
-		createEAttribute(subModelRootEClass, SUB_MODEL_ROOT__COMPATIBILITY);
-		createEAttribute(subModelRootEClass, SUB_MODEL_ROOT__APPLICATION_VERSION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		reviewEClass.getESuperTypes().add(this.getReviewComponent());
-		reviewEClass.getESuperTypes().add(this.getSubModelRoot());
-		commentEClass.getESuperTypes().add(this.getReviewComponent());
-		itemEClass.getESuperTypes().add(this.getReviewComponent());
-		taskReferenceEClass.getESuperTypes().add(this.getReviewComponent());
-		reviewStateEClass.getESuperTypes().add(this.getReviewComponent());
-		reviewGroupEClass.getESuperTypes().add(this.getReviewComponent());
-		reviewGroupEClass.getESuperTypes().add(this.getSubModelRoot());
-		topicEClass.getESuperTypes().add(this.getComment());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(reviewEClass, Review.class, "Review", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getReview_Topics(), this.getTopic(), null, "topics", null, 0, -1, Review.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getReview_ReviewItems(), this.getItem(), null, "reviewItems", null, 0, -1, Review.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getReview_ReviewTask(), this.getTaskReference(), null, "reviewTask", null, 0, 1, Review.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getReview_State(), this.getReviewState(), null, "state", null, 1, 1, Review.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(commentEClass, Comment.class, "Comment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getComment_User(), this.getUser(), null, "user", null, 1, 1, Comment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getComment_Type(), this.getCommentType(), null, "type", null, 1, 1, Comment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getComment_Description(), ecorePackage.getEString(), "description", null, 0, 1, Comment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(itemEClass, Item.class, "Item", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getItem_AddedBy(), this.getUser(), null, "addedBy", null, 1, 1, Item.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getItem_Review(), this.getReview(), null, "review", null, 1, 1, Item.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(locationEClass, Location.class, "Location", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getUser_Id(), ecorePackage.getEString(), "id", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getUser_Email(), ecorePackage.getEString(), "email", null, 0, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(taskReferenceEClass, TaskReference.class, "TaskReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTaskReference_TaskId(), ecorePackage.getEString(), "taskId", null, 0, 1, TaskReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTaskReference_RepositoryURL(), ecorePackage.getEString(), "repositoryURL", null, 0, 1, TaskReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(reviewStateEClass, ReviewState.class, "ReviewState", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(reviewGroupEClass, ReviewGroup.class, "ReviewGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getReviewGroup_Reviews(), this.getReview(), null, "reviews", null, 0, -1, ReviewGroup.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getReviewGroup_ReviewGroupTask(), this.getTaskReference(), null, "reviewGroupTask", null, 0, 1, ReviewGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getReviewGroup_Description(), ecorePackage.getEString(), "description", null, 0, 1, ReviewGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(commentTypeEClass, CommentType.class, "CommentType", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(topicEClass, Topic.class, "Topic", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTopic_Task(), this.getTaskReference(), null, "task", null, 0, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTopic_Location(), this.getLocation(), null, "location", null, 0, -1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTopic_Comments(), this.getComment(), null, "comments", null, 0, -1, Topic.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getTopic_Review(), this.getReview(), null, "review", null, 1, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTopic_Title(), ecorePackage.getEString(), "title", null, 0, 1, Topic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(reviewComponentEClass, ReviewComponent.class, "ReviewComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getReviewComponent_Enabled(), ecorePackage.getEBoolean(), "enabled", "true", 0, 1, ReviewComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(subModelRootEClass, SubModelRoot.class, "SubModelRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSubModelRoot_FragmentVersion(), ecorePackage.getEString(), "fragmentVersion", "0.8.0", 0, 1, SubModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSubModelRoot_Compatibility(), ecorePackage.getEInt(), "compatibility", null, 0, 1, SubModelRoot.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSubModelRoot_ApplicationVersion(), ecorePackage.getEString(), "applicationVersion", "1.0.0", 0, 1, SubModelRoot.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
-		addAnnotation
-		  (getReviewComponent_Enabled(), 
-		   source, 
-		   new String[] {
-			 "namespace", "",
-			 "wildcards", "",
-			 "name", ""
-		   });
-	}
-
-} //ModelPackageImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewComponentImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewComponentImpl.java
deleted file mode 100644
index df2a7733..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewComponentImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Review Component</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl#isEnabled <em>Enabled</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ReviewComponentImpl extends EObjectImpl implements ReviewComponent {
-	/**
-	 * The default value of the '{@link #isEnabled() <em>Enabled</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEnabled()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ENABLED_EDEFAULT = true;
-	/**
-	 * The cached value of the '{@link #isEnabled() <em>Enabled</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEnabled()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean enabled = ENABLED_EDEFAULT;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReviewComponentImpl() {
-		super();
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.REVIEW_COMPONENT;
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEnabled(boolean newEnabled) {
-		boolean oldEnabled = enabled;
-		enabled = newEnabled;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW_COMPONENT__ENABLED, oldEnabled, enabled));
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_COMPONENT__ENABLED:
-				return isEnabled();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_COMPONENT__ENABLED:
-				setEnabled((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_COMPONENT__ENABLED:
-				setEnabled(ENABLED_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_COMPONENT__ENABLED:
-				return enabled != ENABLED_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (enabled: ");
-		result.append(enabled);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ReviewComponentImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewGroupImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewGroupImpl.java
deleted file mode 100644
index 5f472419..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewGroupImpl.java
+++ /dev/null
@@ -1,585 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Review Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl#getFragmentVersion <em>Fragment Version</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl#getCompatibility <em>Compatibility</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl#getApplicationVersion <em>Application Version</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl#getReviews <em>Reviews</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl#getReviewGroupTask <em>Review Group Task</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ReviewGroupImpl extends ReviewComponentImpl implements ReviewGroup {
-	/**
-	 * The default value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFragmentVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FRAGMENT_VERSION_EDEFAULT = "0.8.0";
-
-	/**
-	 * The cached value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFragmentVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fragmentVersion = FRAGMENT_VERSION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCompatibility() <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompatibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int COMPATIBILITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getCompatibility() <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompatibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected int compatibility = COMPATIBILITY_EDEFAULT;
-
-	/**
-	 * This is true if the Compatibility attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean compatibilityESet;
-
-	/**
-	 * The default value of the '{@link #getApplicationVersion() <em>Application Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplicationVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String APPLICATION_VERSION_EDEFAULT = "1.0.0";
-
-	/**
-	 * The cached value of the '{@link #getApplicationVersion() <em>Application Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplicationVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String applicationVersion = APPLICATION_VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Application Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean applicationVersionESet;
-
-	/**
-	 * The cached value of the '{@link #getReviews() <em>Reviews</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReviews()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Review> reviews;
-
-	/**
-	 * The cached value of the '{@link #getReviewGroupTask() <em>Review Group Task</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReviewGroupTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected TaskReference reviewGroupTask;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReviewGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.REVIEW_GROUP;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFragmentVersion() {
-		return fragmentVersion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFragmentVersion(String newFragmentVersion) {
-		String oldFragmentVersion = fragmentVersion;
-		fragmentVersion = newFragmentVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW_GROUP__FRAGMENT_VERSION, oldFragmentVersion, fragmentVersion));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getCompatibility() {
-		return compatibility;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCompatibility(int newCompatibility) {
-		int oldCompatibility = compatibility;
-		compatibility = newCompatibility;
-		boolean oldCompatibilityESet = compatibilityESet;
-		compatibilityESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW_GROUP__COMPATIBILITY, oldCompatibility, compatibility, !oldCompatibilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCompatibility() {
-		int oldCompatibility = compatibility;
-		boolean oldCompatibilityESet = compatibilityESet;
-		compatibility = COMPATIBILITY_EDEFAULT;
-		compatibilityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ModelPackage.REVIEW_GROUP__COMPATIBILITY, oldCompatibility, COMPATIBILITY_EDEFAULT, oldCompatibilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCompatibility() {
-		return compatibilityESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getApplicationVersion() {
-		return applicationVersion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setApplicationVersion(String newApplicationVersion) {
-		String oldApplicationVersion = applicationVersion;
-		applicationVersion = newApplicationVersion;
-		boolean oldApplicationVersionESet = applicationVersionESet;
-		applicationVersionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW_GROUP__APPLICATION_VERSION, oldApplicationVersion, applicationVersion, !oldApplicationVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetApplicationVersion() {
-		String oldApplicationVersion = applicationVersion;
-		boolean oldApplicationVersionESet = applicationVersionESet;
-		applicationVersion = APPLICATION_VERSION_EDEFAULT;
-		applicationVersionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ModelPackage.REVIEW_GROUP__APPLICATION_VERSION, oldApplicationVersion, APPLICATION_VERSION_EDEFAULT, oldApplicationVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetApplicationVersion() {
-		return applicationVersionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Review> getReviews() {
-		if (reviews == null) {
-			reviews = new EObjectContainmentEList.Resolving<Review>(Review.class, this, ModelPackage.REVIEW_GROUP__REVIEWS);
-		}
-		return reviews;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskReference getReviewGroupTask() {
-		if (reviewGroupTask != null && reviewGroupTask.eIsProxy()) {
-			InternalEObject oldReviewGroupTask = (InternalEObject)reviewGroupTask;
-			reviewGroupTask = (TaskReference)eResolveProxy(oldReviewGroupTask);
-			if (reviewGroupTask != oldReviewGroupTask) {
-				InternalEObject newReviewGroupTask = (InternalEObject)reviewGroupTask;
-				NotificationChain msgs = oldReviewGroupTask.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK, null, null);
-				if (newReviewGroupTask.eInternalContainer() == null) {
-					msgs = newReviewGroupTask.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK, oldReviewGroupTask, reviewGroupTask));
-			}
-		}
-		return reviewGroupTask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskReference basicGetReviewGroupTask() {
-		return reviewGroupTask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReviewGroupTask(TaskReference newReviewGroupTask, NotificationChain msgs) {
-		TaskReference oldReviewGroupTask = reviewGroupTask;
-		reviewGroupTask = newReviewGroupTask;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK, oldReviewGroupTask, newReviewGroupTask);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReviewGroupTask(TaskReference newReviewGroupTask) {
-		if (newReviewGroupTask != reviewGroupTask) {
-			NotificationChain msgs = null;
-			if (reviewGroupTask != null)
-				msgs = ((InternalEObject)reviewGroupTask).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK, null, msgs);
-			if (newReviewGroupTask != null)
-				msgs = ((InternalEObject)newReviewGroupTask).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK, null, msgs);
-			msgs = basicSetReviewGroupTask(newReviewGroupTask, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK, newReviewGroupTask, newReviewGroupTask));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW_GROUP__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_GROUP__REVIEWS:
-				return ((InternalEList<?>)getReviews()).basicRemove(otherEnd, msgs);
-			case ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK:
-				return basicSetReviewGroupTask(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_GROUP__FRAGMENT_VERSION:
-				return getFragmentVersion();
-			case ModelPackage.REVIEW_GROUP__COMPATIBILITY:
-				return getCompatibility();
-			case ModelPackage.REVIEW_GROUP__APPLICATION_VERSION:
-				return getApplicationVersion();
-			case ModelPackage.REVIEW_GROUP__REVIEWS:
-				return getReviews();
-			case ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK:
-				if (resolve) return getReviewGroupTask();
-				return basicGetReviewGroupTask();
-			case ModelPackage.REVIEW_GROUP__DESCRIPTION:
-				return getDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_GROUP__FRAGMENT_VERSION:
-				setFragmentVersion((String)newValue);
-				return;
-			case ModelPackage.REVIEW_GROUP__COMPATIBILITY:
-				setCompatibility((Integer)newValue);
-				return;
-			case ModelPackage.REVIEW_GROUP__APPLICATION_VERSION:
-				setApplicationVersion((String)newValue);
-				return;
-			case ModelPackage.REVIEW_GROUP__REVIEWS:
-				getReviews().clear();
-				getReviews().addAll((Collection<? extends Review>)newValue);
-				return;
-			case ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK:
-				setReviewGroupTask((TaskReference)newValue);
-				return;
-			case ModelPackage.REVIEW_GROUP__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_GROUP__FRAGMENT_VERSION:
-				setFragmentVersion(FRAGMENT_VERSION_EDEFAULT);
-				return;
-			case ModelPackage.REVIEW_GROUP__COMPATIBILITY:
-				unsetCompatibility();
-				return;
-			case ModelPackage.REVIEW_GROUP__APPLICATION_VERSION:
-				unsetApplicationVersion();
-				return;
-			case ModelPackage.REVIEW_GROUP__REVIEWS:
-				getReviews().clear();
-				return;
-			case ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK:
-				setReviewGroupTask((TaskReference)null);
-				return;
-			case ModelPackage.REVIEW_GROUP__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.REVIEW_GROUP__FRAGMENT_VERSION:
-				return FRAGMENT_VERSION_EDEFAULT == null ? fragmentVersion != null : !FRAGMENT_VERSION_EDEFAULT.equals(fragmentVersion);
-			case ModelPackage.REVIEW_GROUP__COMPATIBILITY:
-				return isSetCompatibility();
-			case ModelPackage.REVIEW_GROUP__APPLICATION_VERSION:
-				return isSetApplicationVersion();
-			case ModelPackage.REVIEW_GROUP__REVIEWS:
-				return reviews != null && !reviews.isEmpty();
-			case ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK:
-				return reviewGroupTask != null;
-			case ModelPackage.REVIEW_GROUP__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == SubModelRoot.class) {
-			switch (derivedFeatureID) {
-				case ModelPackage.REVIEW_GROUP__FRAGMENT_VERSION: return ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION;
-				case ModelPackage.REVIEW_GROUP__COMPATIBILITY: return ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY;
-				case ModelPackage.REVIEW_GROUP__APPLICATION_VERSION: return ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == SubModelRoot.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION: return ModelPackage.REVIEW_GROUP__FRAGMENT_VERSION;
-				case ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY: return ModelPackage.REVIEW_GROUP__COMPATIBILITY;
-				case ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION: return ModelPackage.REVIEW_GROUP__APPLICATION_VERSION;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fragmentVersion: ");
-		result.append(fragmentVersion);
-		result.append(", compatibility: ");
-		if (compatibilityESet) result.append(compatibility); else result.append("<unset>");
-		result.append(", applicationVersion: ");
-		if (applicationVersionESet) result.append(applicationVersion); else result.append("<unset>");
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ReviewGroupImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewImpl.java
deleted file mode 100644
index cab9e477..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewImpl.java
+++ /dev/null
@@ -1,654 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Review</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getFragmentVersion <em>Fragment Version</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getCompatibility <em>Compatibility</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getApplicationVersion <em>Application Version</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getTopics <em>Topics</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getReviewItems <em>Review Items</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getReviewTask <em>Review Task</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getState <em>State</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ReviewImpl extends ReviewComponentImpl implements Review {
-	/**
-	 * The default value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFragmentVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FRAGMENT_VERSION_EDEFAULT = "0.8.0";
-
-	/**
-	 * The cached value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFragmentVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fragmentVersion = FRAGMENT_VERSION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCompatibility() <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompatibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int COMPATIBILITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getCompatibility() <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompatibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected int compatibility = COMPATIBILITY_EDEFAULT;
-
-	/**
-	 * This is true if the Compatibility attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean compatibilityESet;
-
-	/**
-	 * The default value of the '{@link #getApplicationVersion() <em>Application Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplicationVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String APPLICATION_VERSION_EDEFAULT = "1.0.0";
-
-	/**
-	 * The cached value of the '{@link #getApplicationVersion() <em>Application Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplicationVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String applicationVersion = APPLICATION_VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Application Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean applicationVersionESet;
-
-	/**
-	 * The cached value of the '{@link #getTopics() <em>Topics</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTopics()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Topic> topics;
-
-	/**
-	 * The cached value of the '{@link #getReviewItems() <em>Review Items</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReviewItems()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Item> reviewItems;
-
-	/**
-	 * The cached value of the '{@link #getReviewTask() <em>Review Task</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReviewTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected TaskReference reviewTask;
-
-	/**
-	 * The cached value of the '{@link #getState() <em>State</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getState()
-	 * @generated
-	 * @ordered
-	 */
-	protected ReviewState state;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReviewImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.REVIEW;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFragmentVersion() {
-		return fragmentVersion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFragmentVersion(String newFragmentVersion) {
-		String oldFragmentVersion = fragmentVersion;
-		fragmentVersion = newFragmentVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW__FRAGMENT_VERSION, oldFragmentVersion, fragmentVersion));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getCompatibility() {
-		return compatibility;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCompatibility(int newCompatibility) {
-		int oldCompatibility = compatibility;
-		compatibility = newCompatibility;
-		boolean oldCompatibilityESet = compatibilityESet;
-		compatibilityESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW__COMPATIBILITY, oldCompatibility, compatibility, !oldCompatibilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCompatibility() {
-		int oldCompatibility = compatibility;
-		boolean oldCompatibilityESet = compatibilityESet;
-		compatibility = COMPATIBILITY_EDEFAULT;
-		compatibilityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ModelPackage.REVIEW__COMPATIBILITY, oldCompatibility, COMPATIBILITY_EDEFAULT, oldCompatibilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCompatibility() {
-		return compatibilityESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getApplicationVersion() {
-		return applicationVersion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setApplicationVersion(String newApplicationVersion) {
-		String oldApplicationVersion = applicationVersion;
-		applicationVersion = newApplicationVersion;
-		boolean oldApplicationVersionESet = applicationVersionESet;
-		applicationVersionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW__APPLICATION_VERSION, oldApplicationVersion, applicationVersion, !oldApplicationVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetApplicationVersion() {
-		String oldApplicationVersion = applicationVersion;
-		boolean oldApplicationVersionESet = applicationVersionESet;
-		applicationVersion = APPLICATION_VERSION_EDEFAULT;
-		applicationVersionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ModelPackage.REVIEW__APPLICATION_VERSION, oldApplicationVersion, APPLICATION_VERSION_EDEFAULT, oldApplicationVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetApplicationVersion() {
-		return applicationVersionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Topic> getTopics() {
-		if (topics == null) {
-			topics = new EObjectResolvingEList<Topic>(Topic.class, this, ModelPackage.REVIEW__TOPICS);
-		}
-		return topics;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Item> getReviewItems() {
-		if (reviewItems == null) {
-			reviewItems = new EObjectResolvingEList<Item>(Item.class, this, ModelPackage.REVIEW__REVIEW_ITEMS);
-		}
-		return reviewItems;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskReference getReviewTask() {
-		if (reviewTask != null && reviewTask.eIsProxy()) {
-			InternalEObject oldReviewTask = (InternalEObject)reviewTask;
-			reviewTask = (TaskReference)eResolveProxy(oldReviewTask);
-			if (reviewTask != oldReviewTask) {
-				InternalEObject newReviewTask = (InternalEObject)reviewTask;
-				NotificationChain msgs = oldReviewTask.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW__REVIEW_TASK, null, null);
-				if (newReviewTask.eInternalContainer() == null) {
-					msgs = newReviewTask.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW__REVIEW_TASK, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.REVIEW__REVIEW_TASK, oldReviewTask, reviewTask));
-			}
-		}
-		return reviewTask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskReference basicGetReviewTask() {
-		return reviewTask;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReviewTask(TaskReference newReviewTask, NotificationChain msgs) {
-		TaskReference oldReviewTask = reviewTask;
-		reviewTask = newReviewTask;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW__REVIEW_TASK, oldReviewTask, newReviewTask);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReviewTask(TaskReference newReviewTask) {
-		if (newReviewTask != reviewTask) {
-			NotificationChain msgs = null;
-			if (reviewTask != null)
-				msgs = ((InternalEObject)reviewTask).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW__REVIEW_TASK, null, msgs);
-			if (newReviewTask != null)
-				msgs = ((InternalEObject)newReviewTask).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW__REVIEW_TASK, null, msgs);
-			msgs = basicSetReviewTask(newReviewTask, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW__REVIEW_TASK, newReviewTask, newReviewTask));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewState getState() {
-		if (state != null && state.eIsProxy()) {
-			InternalEObject oldState = (InternalEObject)state;
-			state = (ReviewState)eResolveProxy(oldState);
-			if (state != oldState) {
-				InternalEObject newState = (InternalEObject)state;
-				NotificationChain msgs = oldState.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW__STATE, null, null);
-				if (newState.eInternalContainer() == null) {
-					msgs = newState.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW__STATE, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.REVIEW__STATE, oldState, state));
-			}
-		}
-		return state;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewState basicGetState() {
-		return state;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetState(ReviewState newState, NotificationChain msgs) {
-		ReviewState oldState = state;
-		state = newState;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW__STATE, oldState, newState);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setState(ReviewState newState) {
-		if (newState != state) {
-			NotificationChain msgs = null;
-			if (state != null)
-				msgs = ((InternalEObject)state).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW__STATE, null, msgs);
-			if (newState != null)
-				msgs = ((InternalEObject)newState).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.REVIEW__STATE, null, msgs);
-			msgs = basicSetState(newState, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.REVIEW__STATE, newState, newState));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.REVIEW__REVIEW_TASK:
-				return basicSetReviewTask(null, msgs);
-			case ModelPackage.REVIEW__STATE:
-				return basicSetState(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.REVIEW__FRAGMENT_VERSION:
-				return getFragmentVersion();
-			case ModelPackage.REVIEW__COMPATIBILITY:
-				return getCompatibility();
-			case ModelPackage.REVIEW__APPLICATION_VERSION:
-				return getApplicationVersion();
-			case ModelPackage.REVIEW__TOPICS:
-				return getTopics();
-			case ModelPackage.REVIEW__REVIEW_ITEMS:
-				return getReviewItems();
-			case ModelPackage.REVIEW__REVIEW_TASK:
-				if (resolve) return getReviewTask();
-				return basicGetReviewTask();
-			case ModelPackage.REVIEW__STATE:
-				if (resolve) return getState();
-				return basicGetState();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.REVIEW__FRAGMENT_VERSION:
-				setFragmentVersion((String)newValue);
-				return;
-			case ModelPackage.REVIEW__COMPATIBILITY:
-				setCompatibility((Integer)newValue);
-				return;
-			case ModelPackage.REVIEW__APPLICATION_VERSION:
-				setApplicationVersion((String)newValue);
-				return;
-			case ModelPackage.REVIEW__TOPICS:
-				getTopics().clear();
-				getTopics().addAll((Collection<? extends Topic>)newValue);
-				return;
-			case ModelPackage.REVIEW__REVIEW_ITEMS:
-				getReviewItems().clear();
-				getReviewItems().addAll((Collection<? extends Item>)newValue);
-				return;
-			case ModelPackage.REVIEW__REVIEW_TASK:
-				setReviewTask((TaskReference)newValue);
-				return;
-			case ModelPackage.REVIEW__STATE:
-				setState((ReviewState)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.REVIEW__FRAGMENT_VERSION:
-				setFragmentVersion(FRAGMENT_VERSION_EDEFAULT);
-				return;
-			case ModelPackage.REVIEW__COMPATIBILITY:
-				unsetCompatibility();
-				return;
-			case ModelPackage.REVIEW__APPLICATION_VERSION:
-				unsetApplicationVersion();
-				return;
-			case ModelPackage.REVIEW__TOPICS:
-				getTopics().clear();
-				return;
-			case ModelPackage.REVIEW__REVIEW_ITEMS:
-				getReviewItems().clear();
-				return;
-			case ModelPackage.REVIEW__REVIEW_TASK:
-				setReviewTask((TaskReference)null);
-				return;
-			case ModelPackage.REVIEW__STATE:
-				setState((ReviewState)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.REVIEW__FRAGMENT_VERSION:
-				return FRAGMENT_VERSION_EDEFAULT == null ? fragmentVersion != null : !FRAGMENT_VERSION_EDEFAULT.equals(fragmentVersion);
-			case ModelPackage.REVIEW__COMPATIBILITY:
-				return isSetCompatibility();
-			case ModelPackage.REVIEW__APPLICATION_VERSION:
-				return isSetApplicationVersion();
-			case ModelPackage.REVIEW__TOPICS:
-				return topics != null && !topics.isEmpty();
-			case ModelPackage.REVIEW__REVIEW_ITEMS:
-				return reviewItems != null && !reviewItems.isEmpty();
-			case ModelPackage.REVIEW__REVIEW_TASK:
-				return reviewTask != null;
-			case ModelPackage.REVIEW__STATE:
-				return state != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == SubModelRoot.class) {
-			switch (derivedFeatureID) {
-				case ModelPackage.REVIEW__FRAGMENT_VERSION: return ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION;
-				case ModelPackage.REVIEW__COMPATIBILITY: return ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY;
-				case ModelPackage.REVIEW__APPLICATION_VERSION: return ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == SubModelRoot.class) {
-			switch (baseFeatureID) {
-				case ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION: return ModelPackage.REVIEW__FRAGMENT_VERSION;
-				case ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY: return ModelPackage.REVIEW__COMPATIBILITY;
-				case ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION: return ModelPackage.REVIEW__APPLICATION_VERSION;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fragmentVersion: ");
-		result.append(fragmentVersion);
-		result.append(", compatibility: ");
-		if (compatibilityESet) result.append(compatibility); else result.append("<unset>");
-		result.append(", applicationVersion: ");
-		if (applicationVersionESet) result.append(applicationVersion); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //ReviewImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewStateImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewStateImpl.java
deleted file mode 100644
index 2dbf8ef2..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/ReviewStateImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Review State</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ReviewStateImpl extends ReviewComponentImpl implements ReviewState {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReviewStateImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.REVIEW_STATE;
-	}
-
-} //ReviewStateImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/SubModelRootImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/SubModelRootImpl.java
deleted file mode 100644
index 7e261e75..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/SubModelRootImpl.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Sub Model Root</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.SubModelRootImpl#getFragmentVersion <em>Fragment Version</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.SubModelRootImpl#getCompatibility <em>Compatibility</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.SubModelRootImpl#getApplicationVersion <em>Application Version</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SubModelRootImpl extends EObjectImpl implements SubModelRoot {
-	/**
-	 * The default value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFragmentVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FRAGMENT_VERSION_EDEFAULT = "0.8.0";
-
-	/**
-	 * The cached value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFragmentVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String fragmentVersion = FRAGMENT_VERSION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCompatibility() <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompatibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int COMPATIBILITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getCompatibility() <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompatibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected int compatibility = COMPATIBILITY_EDEFAULT;
-
-	/**
-	 * This is true if the Compatibility attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean compatibilityESet;
-
-	/**
-	 * The default value of the '{@link #getApplicationVersion() <em>Application Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplicationVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String APPLICATION_VERSION_EDEFAULT = "1.0.0";
-
-	/**
-	 * The cached value of the '{@link #getApplicationVersion() <em>Application Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getApplicationVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String applicationVersion = APPLICATION_VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Application Version attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean applicationVersionESet;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SubModelRootImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.SUB_MODEL_ROOT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFragmentVersion() {
-		return fragmentVersion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFragmentVersion(String newFragmentVersion) {
-		String oldFragmentVersion = fragmentVersion;
-		fragmentVersion = newFragmentVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION, oldFragmentVersion, fragmentVersion));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getCompatibility() {
-		return compatibility;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCompatibility(int newCompatibility) {
-		int oldCompatibility = compatibility;
-		compatibility = newCompatibility;
-		boolean oldCompatibilityESet = compatibilityESet;
-		compatibilityESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY, oldCompatibility, compatibility, !oldCompatibilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetCompatibility() {
-		int oldCompatibility = compatibility;
-		boolean oldCompatibilityESet = compatibilityESet;
-		compatibility = COMPATIBILITY_EDEFAULT;
-		compatibilityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY, oldCompatibility, COMPATIBILITY_EDEFAULT, oldCompatibilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCompatibility() {
-		return compatibilityESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getApplicationVersion() {
-		return applicationVersion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setApplicationVersion(String newApplicationVersion) {
-		String oldApplicationVersion = applicationVersion;
-		applicationVersion = newApplicationVersion;
-		boolean oldApplicationVersionESet = applicationVersionESet;
-		applicationVersionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION, oldApplicationVersion, applicationVersion, !oldApplicationVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetApplicationVersion() {
-		String oldApplicationVersion = applicationVersion;
-		boolean oldApplicationVersionESet = applicationVersionESet;
-		applicationVersion = APPLICATION_VERSION_EDEFAULT;
-		applicationVersionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION, oldApplicationVersion, APPLICATION_VERSION_EDEFAULT, oldApplicationVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetApplicationVersion() {
-		return applicationVersionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION:
-				return getFragmentVersion();
-			case ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY:
-				return getCompatibility();
-			case ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION:
-				return getApplicationVersion();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION:
-				setFragmentVersion((String)newValue);
-				return;
-			case ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY:
-				setCompatibility((Integer)newValue);
-				return;
-			case ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION:
-				setApplicationVersion((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION:
-				setFragmentVersion(FRAGMENT_VERSION_EDEFAULT);
-				return;
-			case ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY:
-				unsetCompatibility();
-				return;
-			case ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION:
-				unsetApplicationVersion();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION:
-				return FRAGMENT_VERSION_EDEFAULT == null ? fragmentVersion != null : !FRAGMENT_VERSION_EDEFAULT.equals(fragmentVersion);
-			case ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY:
-				return isSetCompatibility();
-			case ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION:
-				return isSetApplicationVersion();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (fragmentVersion: ");
-		result.append(fragmentVersion);
-		result.append(", compatibility: ");
-		if (compatibilityESet) result.append(compatibility); else result.append("<unset>");
-		result.append(", applicationVersion: ");
-		if (applicationVersionESet) result.append(applicationVersion); else result.append("<unset>");
-		result.append(')');
-		return result.toString();
-	}
-
-} //SubModelRootImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/TaskReferenceImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/TaskReferenceImpl.java
deleted file mode 100644
index cd2d3ef8..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/TaskReferenceImpl.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Task Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TaskReferenceImpl#getTaskId <em>Task Id</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TaskReferenceImpl#getRepositoryURL <em>Repository URL</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TaskReferenceImpl extends ReviewComponentImpl implements TaskReference {
-	/**
-	 * The default value of the '{@link #getTaskId() <em>Task Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaskId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TASK_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTaskId() <em>Task Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaskId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String taskId = TASK_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRepositoryURL() <em>Repository URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepositoryURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REPOSITORY_URL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRepositoryURL() <em>Repository URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRepositoryURL()
-	 * @generated
-	 * @ordered
-	 */
-	protected String repositoryURL = REPOSITORY_URL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaskReferenceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.TASK_REFERENCE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTaskId() {
-		return taskId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaskId(String newTaskId) {
-		String oldTaskId = taskId;
-		taskId = newTaskId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.TASK_REFERENCE__TASK_ID, oldTaskId, taskId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getRepositoryURL() {
-		return repositoryURL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRepositoryURL(String newRepositoryURL) {
-		String oldRepositoryURL = repositoryURL;
-		repositoryURL = newRepositoryURL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.TASK_REFERENCE__REPOSITORY_URL, oldRepositoryURL, repositoryURL));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.TASK_REFERENCE__TASK_ID:
-				return getTaskId();
-			case ModelPackage.TASK_REFERENCE__REPOSITORY_URL:
-				return getRepositoryURL();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.TASK_REFERENCE__TASK_ID:
-				setTaskId((String)newValue);
-				return;
-			case ModelPackage.TASK_REFERENCE__REPOSITORY_URL:
-				setRepositoryURL((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.TASK_REFERENCE__TASK_ID:
-				setTaskId(TASK_ID_EDEFAULT);
-				return;
-			case ModelPackage.TASK_REFERENCE__REPOSITORY_URL:
-				setRepositoryURL(REPOSITORY_URL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.TASK_REFERENCE__TASK_ID:
-				return TASK_ID_EDEFAULT == null ? taskId != null : !TASK_ID_EDEFAULT.equals(taskId);
-			case ModelPackage.TASK_REFERENCE__REPOSITORY_URL:
-				return REPOSITORY_URL_EDEFAULT == null ? repositoryURL != null : !REPOSITORY_URL_EDEFAULT.equals(repositoryURL);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (taskId: ");
-		result.append(taskId);
-		result.append(", repositoryURL: ");
-		result.append(repositoryURL);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TaskReferenceImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/TopicImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/TopicImpl.java
deleted file mode 100644
index 15ed603c..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/TopicImpl.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Topic</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl#getTask <em>Task</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl#getComments <em>Comments</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl#getReview <em>Review</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl#getTitle <em>Title</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TopicImpl extends CommentImpl implements Topic {
-	/**
-	 * The cached value of the '{@link #getTask() <em>Task</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTask()
-	 * @generated
-	 * @ordered
-	 */
-	protected TaskReference task;
-
-	/**
-	 * The cached value of the '{@link #getLocation() <em>Location</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Location> location;
-
-	/**
-	 * The cached value of the '{@link #getComments() <em>Comments</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getComments()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Comment> comments;
-
-	/**
-	 * The cached value of the '{@link #getReview() <em>Review</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReview()
-	 * @generated
-	 * @ordered
-	 */
-	protected Review review;
-
-	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TITLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String title = TITLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TopicImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.TOPIC;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskReference getTask() {
-		if (task != null && task.eIsProxy()) {
-			InternalEObject oldTask = (InternalEObject)task;
-			task = (TaskReference)eResolveProxy(oldTask);
-			if (task != oldTask) {
-				InternalEObject newTask = (InternalEObject)task;
-				NotificationChain msgs = oldTask.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.TOPIC__TASK, null, null);
-				if (newTask.eInternalContainer() == null) {
-					msgs = newTask.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.TOPIC__TASK, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.TOPIC__TASK, oldTask, task));
-			}
-		}
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TaskReference basicGetTask() {
-		return task;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTask(TaskReference newTask, NotificationChain msgs) {
-		TaskReference oldTask = task;
-		task = newTask;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ModelPackage.TOPIC__TASK, oldTask, newTask);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTask(TaskReference newTask) {
-		if (newTask != task) {
-			NotificationChain msgs = null;
-			if (task != null)
-				msgs = ((InternalEObject)task).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ModelPackage.TOPIC__TASK, null, msgs);
-			if (newTask != null)
-				msgs = ((InternalEObject)newTask).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.TOPIC__TASK, null, msgs);
-			msgs = basicSetTask(newTask, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.TOPIC__TASK, newTask, newTask));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Location> getLocation() {
-		if (location == null) {
-			location = new EObjectContainmentEList.Resolving<Location>(Location.class, this, ModelPackage.TOPIC__LOCATION);
-		}
-		return location;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Comment> getComments() {
-		if (comments == null) {
-			comments = new EObjectResolvingEList<Comment>(Comment.class, this, ModelPackage.TOPIC__COMMENTS);
-		}
-		return comments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Review getReview() {
-		if (review != null && review.eIsProxy()) {
-			InternalEObject oldReview = (InternalEObject)review;
-			review = (Review)eResolveProxy(oldReview);
-			if (review != oldReview) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.TOPIC__REVIEW, oldReview, review));
-			}
-		}
-		return review;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Review basicGetReview() {
-		return review;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReview(Review newReview) {
-		Review oldReview = review;
-		review = newReview;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.TOPIC__REVIEW, oldReview, review));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTitle() {
-		return title!= null ? title : "";
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTitle(String newTitle) {
-		String oldTitle = title;
-		title = newTitle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.TOPIC__TITLE, oldTitle, title));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ModelPackage.TOPIC__TASK:
-				return basicSetTask(null, msgs);
-			case ModelPackage.TOPIC__LOCATION:
-				return ((InternalEList<?>)getLocation()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.TOPIC__TASK:
-				if (resolve) return getTask();
-				return basicGetTask();
-			case ModelPackage.TOPIC__LOCATION:
-				return getLocation();
-			case ModelPackage.TOPIC__COMMENTS:
-				return getComments();
-			case ModelPackage.TOPIC__REVIEW:
-				if (resolve) return getReview();
-				return basicGetReview();
-			case ModelPackage.TOPIC__TITLE:
-				return getTitle();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.TOPIC__TASK:
-				setTask((TaskReference)newValue);
-				return;
-			case ModelPackage.TOPIC__LOCATION:
-				getLocation().clear();
-				getLocation().addAll((Collection<? extends Location>)newValue);
-				return;
-			case ModelPackage.TOPIC__COMMENTS:
-				getComments().clear();
-				getComments().addAll((Collection<? extends Comment>)newValue);
-				return;
-			case ModelPackage.TOPIC__REVIEW:
-				setReview((Review)newValue);
-				return;
-			case ModelPackage.TOPIC__TITLE:
-				setTitle((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.TOPIC__TASK:
-				setTask((TaskReference)null);
-				return;
-			case ModelPackage.TOPIC__LOCATION:
-				getLocation().clear();
-				return;
-			case ModelPackage.TOPIC__COMMENTS:
-				getComments().clear();
-				return;
-			case ModelPackage.TOPIC__REVIEW:
-				setReview((Review)null);
-				return;
-			case ModelPackage.TOPIC__TITLE:
-				setTitle(TITLE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.TOPIC__TASK:
-				return task != null;
-			case ModelPackage.TOPIC__LOCATION:
-				return location != null && !location.isEmpty();
-			case ModelPackage.TOPIC__COMMENTS:
-				return comments != null && !comments.isEmpty();
-			case ModelPackage.TOPIC__REVIEW:
-				return review != null;
-			case ModelPackage.TOPIC__TITLE:
-				return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (title: ");
-		result.append(title);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TopicImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/UserImpl.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/UserImpl.java
deleted file mode 100644
index 36729553..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/impl/UserImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>User</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.UserImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.frame.core.model.impl.UserImpl#getEmail <em>Email</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class UserImpl extends EObjectImpl implements User {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEmail() <em>Email</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmail()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EMAIL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEmail() <em>Email</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmail()
-	 * @generated
-	 * @ordered
-	 */
-	protected String email = EMAIL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UserImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ModelPackage.Literals.USER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USER__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEmail() {
-		return email;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEmail(String newEmail) {
-		String oldEmail = email;
-		email = newEmail;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USER__EMAIL, oldEmail, email));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ModelPackage.USER__ID:
-				return getId();
-			case ModelPackage.USER__EMAIL:
-				return getEmail();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ModelPackage.USER__ID:
-				setId((String)newValue);
-				return;
-			case ModelPackage.USER__EMAIL:
-				setEmail((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ModelPackage.USER__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case ModelPackage.USER__EMAIL:
-				setEmail(EMAIL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ModelPackage.USER__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case ModelPackage.USER__EMAIL:
-				return EMAIL_EDEFAULT == null ? email != null : !EMAIL_EDEFAULT.equals(email);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", email: ");
-		result.append(email);
-		result.append(')');
-		return result.toString();
-	}
-
-} //UserImpl
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/util/ModelAdapterFactory.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/util/ModelAdapterFactory.java
deleted file mode 100644
index 22e67e64..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/util/ModelAdapterFactory.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.mylyn.reviews.frame.core.model.*;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.mylyn.reviews.frame.core.model.ModelPackage
- * @generated
- */
-public class ModelAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ModelPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ModelPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelSwitch<Adapter> modelSwitch =
-		new ModelSwitch<Adapter>() {
-			@Override
-			public Adapter caseReview(Review object) {
-				return createReviewAdapter();
-			}
-			@Override
-			public Adapter caseComment(Comment object) {
-				return createCommentAdapter();
-			}
-			@Override
-			public Adapter caseItem(Item object) {
-				return createItemAdapter();
-			}
-			@Override
-			public Adapter caseLocation(Location object) {
-				return createLocationAdapter();
-			}
-			@Override
-			public Adapter caseUser(User object) {
-				return createUserAdapter();
-			}
-			@Override
-			public Adapter caseTaskReference(TaskReference object) {
-				return createTaskReferenceAdapter();
-			}
-			@Override
-			public Adapter caseReviewState(ReviewState object) {
-				return createReviewStateAdapter();
-			}
-			@Override
-			public Adapter caseReviewGroup(ReviewGroup object) {
-				return createReviewGroupAdapter();
-			}
-			@Override
-			public Adapter caseCommentType(CommentType object) {
-				return createCommentTypeAdapter();
-			}
-			@Override
-			public Adapter caseTopic(Topic object) {
-				return createTopicAdapter();
-			}
-			@Override
-			public Adapter caseReviewComponent(ReviewComponent object) {
-				return createReviewComponentAdapter();
-			}
-			@Override
-			public Adapter caseSubModelRoot(SubModelRoot object) {
-				return createSubModelRootAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Review <em>Review</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Review
-	 * @generated
-	 */
-	public Adapter createReviewAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment <em>Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Comment
-	 * @generated
-	 */
-	public Adapter createCommentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Item <em>Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Item
-	 * @generated
-	 */
-	public Adapter createItemAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Location <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Location
-	 * @generated
-	 */
-	public Adapter createLocationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.User <em>User</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.User
-	 * @generated
-	 */
-	public Adapter createUserAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference <em>Task Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.TaskReference
-	 * @generated
-	 */
-	public Adapter createTaskReferenceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewState <em>Review State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewState
-	 * @generated
-	 */
-	public Adapter createReviewStateAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup <em>Review Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup
-	 * @generated
-	 */
-	public Adapter createReviewGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.CommentType <em>Comment Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.CommentType
-	 * @generated
-	 */
-	public Adapter createCommentTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic <em>Topic</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Topic
-	 * @generated
-	 */
-	public Adapter createTopicAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent <em>Review Component</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent
-	 * @generated
-	 */
-	public Adapter createReviewComponentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot <em>Sub Model Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot
-	 * @generated
-	 */
-	public Adapter createSubModelRootAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ModelAdapterFactory
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/util/ModelSwitch.java b/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/util/ModelSwitch.java
deleted file mode 100644
index 020189fc..00000000
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/model/util/ModelSwitch.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Ericsson
- * 
- * 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
- * 
- * Description:
- * 
- * Contributors:
- *   Alvaro Sanchez-Leon - Initial Implementation and API
- *******************************************************************************/
-package org.eclipse.mylyn.reviews.frame.core.model.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.mylyn.reviews.frame.core.model.*;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-
-public class ModelSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ModelPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ModelPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ModelPackage.REVIEW: {
-				Review review = (Review)theEObject;
-				T result = caseReview(review);
-				if (result == null) result = caseReviewComponent(review);
-				if (result == null) result = caseSubModelRoot(review);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.COMMENT: {
-				Comment comment = (Comment)theEObject;
-				T result = caseComment(comment);
-				if (result == null) result = caseReviewComponent(comment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.ITEM: {
-				Item item = (Item)theEObject;
-				T result = caseItem(item);
-				if (result == null) result = caseReviewComponent(item);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.LOCATION: {
-				Location location = (Location)theEObject;
-				T result = caseLocation(location);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.USER: {
-				User user = (User)theEObject;
-				T result = caseUser(user);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.TASK_REFERENCE: {
-				TaskReference taskReference = (TaskReference)theEObject;
-				T result = caseTaskReference(taskReference);
-				if (result == null) result = caseReviewComponent(taskReference);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.REVIEW_STATE: {
-				ReviewState reviewState = (ReviewState)theEObject;
-				T result = caseReviewState(reviewState);
-				if (result == null) result = caseReviewComponent(reviewState);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.REVIEW_GROUP: {
-				ReviewGroup reviewGroup = (ReviewGroup)theEObject;
-				T result = caseReviewGroup(reviewGroup);
-				if (result == null) result = caseReviewComponent(reviewGroup);
-				if (result == null) result = caseSubModelRoot(reviewGroup);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.COMMENT_TYPE: {
-				CommentType commentType = (CommentType)theEObject;
-				T result = caseCommentType(commentType);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.TOPIC: {
-				Topic topic = (Topic)theEObject;
-				T result = caseTopic(topic);
-				if (result == null) result = caseComment(topic);
-				if (result == null) result = caseReviewComponent(topic);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.REVIEW_COMPONENT: {
-				ReviewComponent reviewComponent = (ReviewComponent)theEObject;
-				T result = caseReviewComponent(reviewComponent);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ModelPackage.SUB_MODEL_ROOT: {
-				SubModelRoot subModelRoot = (SubModelRoot)theEObject;
-				T result = caseSubModelRoot(subModelRoot);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Review</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Review</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseReview(Review object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Comment</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseComment(Comment object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Item</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseItem(Item object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Location</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Location</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLocation(Location object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>User</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>User</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseUser(User object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Task Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Task Reference</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTaskReference(TaskReference object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Review State</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Review State</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseReviewState(ReviewState object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Review Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Review Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseReviewGroup(ReviewGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comment Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Comment Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCommentType(CommentType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Topic</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Topic</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTopic(Topic object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Review Component</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Review Component</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseReviewComponent(ReviewComponent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sub Model Root</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sub Model Root</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSubModelRoot(SubModelRoot object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //ModelSwitch
diff --git a/org.eclipse.mylyn.reviews.r4e-target/r4e.target b/org.eclipse.mylyn.reviews.r4e-target/r4e.target
new file mode 100644
index 00000000..61c91fc3
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e-target/r4e.target
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Mylyn Reviews Target" sequenceNumber="103">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.pde.api.tools.ee.javase16.group" version="1.0.0.v20120530-1420-7D-FYwFAFkNZkOIwNB_6kN"/>
+<unit id="org.eclipse.pde.api.tools.ee.javase17.group" version="1.0.0.v20120530-1420-7D-FYwFAFkNZkOIwNB_6kN"/>
+<unit id="org.eclipse.platform.ide" version="3.8.1.M20120914-1540"/>
+<unit id="org.eclipse.sdk.ide" version="3.8.1.M20120914-1540"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.birt.feature.group" version="4.2.1.v20120820-ChBG8UGYgRQlJ7y9Lz-wS7nDcRL4"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.1.v20120917-0436"/>
+<unit id="org.eclipse.wb.swt.feature.feature.group" version="1.5.1.r42x201209161211"/>
+<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.0.1.v20120917-0741"/>
+<unit id="org.eclipse.cdt.feature.group" version="8.1.1.201209170703"/>
+<repository location="http://download.eclipse.org/releases/juno"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.egit.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.egit.mylyn.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jgit.source.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/egit/updates-1.3"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="javax.activation" version="0.0.0"/>
+<unit id="javax.mail" version="0.0.0"/>
+<unit id="com.google.gerrit.common" version="0.0.0"/>
+<unit id="com.google.gerrit.common.source" version="0.0.0"/>
+<unit id="com.google.gerrit.prettify" version="0.0.0"/>
+<unit id="com.google.gerrit.prettify.source" version="0.0.0"/>
+<unit id="com.google.gerrit.reviewdb" version="0.0.0"/>
+<unit id="com.google.gerrit.reviewdb.source" version="0.0.0"/>
+<unit id="org.hamcrest.core" version="0.0.0"/>
+<unit id="org.hamcrest.core.source" version="0.0.0"/>
+<unit id="org.hamcrest.integration.source" version="0.0.0"/>
+<unit id="org.hamcrest.generator" version="0.0.0"/>
+<unit id="org.hamcrest.generator.source" version="0.0.0"/>
+<unit id="org.hamcrest.integration" version="0.0.0"/>
+<unit id="org.hamcrest.library" version="0.0.0"/>
+<unit id="org.hamcrest.library.source" version="0.0.0"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<unit id="org.hamcrest.text" version="0.0.0"/>
+<unit id="org.hamcrest.text.source" version="0.0.0"/>
+<unit id="org.objenesis.source" version="0.0.0"/>
+<unit id="org.objenesis" version="0.0.0"/>
+<unit id="org.mockito" version="0.0.0"/>
+<unit id="org.mockito.source" version="0.0.0"/>
+<unit id="org.apache.commons.io" version="0.0.0"/>
+<unit id="org.apache.commons.logging" version="0.0.0"/>
+<unit id="org.antlr.runtime" version="3.0.0.v200803061811"/>
+<unit id="org.apache.xmlrpc" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.core.tests/META-INF/MANIFEST.MF
index 00eef5a8..07ce5e78 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Export-Package: org.eclipse.egit.core.test;x-internal:=true,
  org.eclipse.mylyn.reviews.r4e.core.utils.filePermission;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.reviews.r4e.core,
- org.eclipse.mylyn.reviews.frame.core,
  org.eclipse.emf.ecore.xmi,
  org.junit4,
  org.apache.commons.io;bundle-version="2.0.1",
@@ -28,5 +27,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.core;bundle-version="3.5.0",
  org.eclipse.jdt.launching;bundle-version="3.5.0",
  org.eclipse.mylyn.versions.core;bundle-version="0.1.0",
- org.eclipse.mylyn.reviews.r4e.transform;bundle-version="0.10.0"
+ org.eclipse.mylyn.reviews.r4e.transform;bundle-version="0.10.0",
+ org.eclipse.mylyn.reviews.core;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/R4ECoreAllTests.java b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/R4ECoreAllTests.java
index 36caf406..2d13b09b 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/R4ECoreAllTests.java
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/R4ECoreAllTests.java
@@ -23,6 +23,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.serial.PersistenceTest;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ChangeResControllerTest;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CommonTest;
 import org.eclipse.mylyn.reviews.r4e.core.model.tests.ModelTests;
+import org.eclipse.mylyn.reviews.r4e.core.utils.CommonModelFileConverterTest;
 import org.eclipse.mylyn.reviews.r4e.core.utils.filePermission.OSPermissionTest;
 
 /**
@@ -53,6 +54,7 @@ public class R4ECoreAllTests extends TestSuite {
 		suite.addTestSuite(OSPermissionTest.class);
 		suite.addTestSuite(ChangeResControllerTest.class);
 		suite.addTestSuite(CommonTest.class);
+		suite.addTestSuite(CommonModelFileConverterTest.class);
 		return suite;
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/TstGeneral.java b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/TstGeneral.java
index ddb5d87e..ae54848a 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/TstGeneral.java
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/TstGeneral.java
@@ -19,7 +19,7 @@ import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 
 public class TstGeneral {
 	// ------------------------------------------------------------------------
@@ -27,6 +27,8 @@ public class TstGeneral {
 	// ------------------------------------------------------------------------
 	public static final String GROUP_PATH_STR = "outGroupX";
 
+	//Pre common model fixes
+
 	public static final String GOLDEN_GROUP_DIR_STR = "stubs_model/" + GROUP_PATH_STR;
 
 	public static final String GOLDEN_GROUP_FILE_STR = GOLDEN_GROUP_DIR_STR + "/Golden_Group_group_root.xrer";
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/BasePersistenceTest.java b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/BasePersistenceTest.java
new file mode 100644
index 00000000..c642642c
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/BasePersistenceTest.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2012 Ericsson
+ * 
+ * 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
+ * 
+ * Description:
+ * 
+ * Contributors:
+ *   Alvaro Sanchez-Leon - Initial API and Implementation
+ *******************************************************************************/
+
+/**
+ * 
+ */
+package org.eclipse.mylyn.reviews.r4e.core.model.serial;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.io.FileUtils;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.mylyn.reviews.r4e.core.TstGeneral;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.RModelFactoryExt;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ResourceUpdater;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.SerializeFactory;
+import org.junit.After;
+import org.junit.Before;
+
+/**
+ * @author Alvaro Sanchez-Leon
+ */
+public class BasePersistenceTest extends TestCase {
+
+	// ------------------------------------------------------------------------
+	// Constants
+	// ------------------------------------------------------------------------
+	protected static final URI fGoldenGroup = TstGeneral.GOLDEN_GROUP_FILE;
+
+	private static File fTestDir;
+
+	// ------------------------------------------------------------------------
+	// Instance Variables
+	// ------------------------------------------------------------------------
+	protected final RModelFactoryExt fResFactory = SerializeFactory.getModelExtension();
+
+	protected final ResourceUpdater fUpdater = SerializeFactory.getResourceSetUpdater();
+
+	protected R4EReviewGroup fGroup = null;
+
+	protected static File fRootTestDir = null;
+
+	protected final String fSep = File.separator;
+
+	protected boolean keepFiles;
+
+	// ------------------------------------------------------------------------
+	// RWCommon
+	// ------------------------------------------------------------------------
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Override
+	@Before
+	public void setUp() throws Exception {
+		String base = System.getProperty("java.io.tmpdir");
+		if (!base.endsWith(File.separator)) {
+			base = base + File.separator;
+		}
+
+		fRootTestDir = new File(base + "r4eTst" + File.separator + System.currentTimeMillis());
+
+		// Resolve golden group storage dir
+		String rootFile = fGoldenGroup.lastSegment();
+		File goldenDir = new File(URI.decode(fGoldenGroup.trimSegments(1).devicePath()));
+
+		// Take the directory name to be used as copy destination
+		String testDir = fRootTestDir.toString() + File.separator + "OutL1" + fSep + "OutL2" + fSep
+				+ goldenDir.getName();
+		fTestDir = new File(testDir);
+
+		// Determine the location of the group file in the destination folder
+		URI testRootURI = URI.createFileURI(fTestDir.getAbsolutePath());
+		testRootURI = testRootURI.appendSegment(rootFile);
+
+		// Copy golden dir to test dir
+		FileUtils.copyDirectory(goldenDir, fTestDir);
+
+		// Load
+		try {
+			fGroup = fResFactory.openR4EReviewGroup(testRootURI);
+		} catch (ResourceHandlingException e) {
+			e.printStackTrace();
+		}
+
+		// Tracing on
+		TstGeneral.activateTracer();
+	}
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Override
+	@After
+	public void tearDown() throws Exception {
+		fResFactory.closeR4EReviewGroup(fGroup);
+		// remove test directory
+		if (!keepFiles && fRootTestDir != null && fRootTestDir.exists()) {
+			FileUtils.deleteDirectory(fRootTestDir);
+		}
+	}
+}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/PersistenceTest.java b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/PersistenceTest.java
index 405293cc..e2068c79 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/PersistenceTest.java
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/PersistenceTest.java
@@ -20,105 +20,22 @@ package org.eclipse.mylyn.reviews.r4e.core.model.serial;
 import java.io.File;
 import java.io.IOException;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.io.FileUtils;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.mylyn.reviews.r4e.core.TstGeneral;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EDecision;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewDecision;
-import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUser;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelFactory;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.RModelFactoryExt;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ResourceUpdater;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.SerializeFactory;
-import org.junit.After;
-import org.junit.Before;
 
 /**
  * @author Alvaro Sanchez-Leon
  */
-public class PersistenceTest extends TestCase {
-
-	// ------------------------------------------------------------------------
-	// Constants
-	// ------------------------------------------------------------------------
-	private static final URI fGoldenGroup = TstGeneral.GOLDEN_GROUP_FILE;
-
-	private static File fTestDir;
-
-	// ------------------------------------------------------------------------
-	// Instance Variables
-	// ------------------------------------------------------------------------
-	private final RModelFactoryExt fResFactory = SerializeFactory.getModelExtension();
-
-	private final ResourceUpdater fUpdater = SerializeFactory.getResourceSetUpdater();
-
-	private R4EReviewGroup fGroup = null;
-
-	private static File fRootTestDir = null;
-
-	private final String fSep = File.separator;
-
-	// ------------------------------------------------------------------------
-	// RWCommon
-	// ------------------------------------------------------------------------
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-		String base = System.getProperty("java.io.tmpdir");
-		if (!base.endsWith(File.separator)) {
-			base = base + File.separator;
-		}
-
-		fRootTestDir = new File(base + "r4eTst");
-
-		// Resolve golden group storage dir
-		String rootFile = fGoldenGroup.lastSegment();
-		File goldenDir = new File(URI.decode(fGoldenGroup.trimSegments(1).devicePath()));
-
-		// Take the directory name to be used as copy destination
-		String testDir = fRootTestDir.toString() + "OutL1" + fSep + "OutL2" + fSep + goldenDir.getName();
-		fTestDir = new File(testDir);
-
-		// Determine the location of the group file in the destination folder
-		URI testRootURI = URI.createFileURI(fTestDir.getAbsolutePath());
-		testRootURI = testRootURI.appendSegment(rootFile);
-
-		// Copy golden dir to test dir
-		FileUtils.copyDirectory(goldenDir, fTestDir);
-
-		// Load
-		try {
-			fGroup = fResFactory.openR4EReviewGroup(testRootURI);
-		} catch (ResourceHandlingException e) {
-			e.printStackTrace();
-		}
-
-		// Tracing on
-		TstGeneral.activateTracer();
-	}
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@After
-	public void tearDown() throws Exception {
-		fResFactory.closeR4EReviewGroup(fGroup);
-		// remove test directory
-		if (fRootTestDir != null && fRootTestDir.exists()) {
-			FileUtils.deleteDirectory(fRootTestDir);
-		}
-	}
+public class PersistenceTest extends BasePersistenceTest {
 
 	// ------------------------------------------------------------------------
 	// TEST METHODS
@@ -154,7 +71,7 @@ public class PersistenceTest extends TestCase {
 		int spentTime = 100;
 		R4EReviewDecision decision = RModelFactory.eINSTANCE.createR4EReviewDecision();
 		decision.setSpentTime(spentTime);
-		decision.setValue(R4EDecision.R4E_REVIEW_DECISION_ACCEPTED);
+		decision.setValue(R4EDecision.ACCEPTED);
 		review.setDecision(decision);
 
 		// Check-In and Save
@@ -184,14 +101,14 @@ public class PersistenceTest extends TestCase {
 		// Verify that change was persisted
 		decision = review.getDecision();
 		assertEquals(spentTime, decision.getSpentTime());
-		assertEquals(R4EDecision.R4E_REVIEW_DECISION_ACCEPTED, decision.getValue());
+		assertEquals(R4EDecision.ACCEPTED, decision.getValue());
 	}
 
 	/**
 	 * Testing writing permissions
 	 */
 	public void testReadWritePermissions() {
-		String dirName = fRootTestDir.toString() + "tFolder";
+		String dirName = fRootTestDir.toString() + File.separator + "tFolder";
 		File tfolder = new File(dirName);
 		tfolder.mkdir();
 
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/tests/ModelExample.java b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/tests/ModelExample.java
index 51df71ce..3229f0ab 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/tests/ModelExample.java
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/tests/ModelExample.java
@@ -25,9 +25,9 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelFactory;
+import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.util.RModelResourceFactoryImpl;
 
 /**
@@ -56,7 +56,7 @@ public class ModelExample {
 
 		// Register the package to ensure it is available during loading.
 		//
-		resourceSet.getPackageRegistry().put(ModelPackage.eNS_URI, ModelPackage.eINSTANCE);
+		resourceSet.getPackageRegistry().put(RModelPackage.eNS_URI, RModelPackage.eINSTANCE);
 
 		// If there are no arguments, emit an appropriate usage message.
 		//
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/tests/R4EReviewGroupTest.java b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/tests/R4EReviewGroupTest.java
index 36bef4aa..c4c6e177 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/tests/R4EReviewGroupTest.java
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/model/tests/R4EReviewGroupTest.java
@@ -301,7 +301,7 @@ public class R4EReviewGroupTest extends TestCase {
 	// loadedGroup = GoldenStubHandler.loadStub(groupFileUri);
 	// resSet = loadedGroup.eResource().getResourceSet();
 	// // load all reviews, to associate to the same resourceSet
-	// EList<Review> reviews = loadedGroup.getReviews();
+	// List<Review> reviews = loadedGroup.getReviews();
 	// for (Iterator<Review> iterator = reviews.iterator(); iterator.hasNext();) {
 	// Review review = iterator.next();
 	// fFactory.openR4EReview(loadedGroup, ((R4EReview) review).getName());
@@ -365,7 +365,7 @@ public class R4EReviewGroupTest extends TestCase {
 	// try {
 	// loadedGroup = fFactory.openR4EReviewGroup(groupFileURI);
 	// // load all reviews, to associate to the same resourceSet
-	// EMap<String, R4EReview> reviews = loadedGroup.getReviewsMap();
+	// Map<String, R4EReview> reviews = loadedGroup.getReviewsMap();
 	// for (Iterator<String> iterator = reviews.keySet().iterator(); iterator.hasNext();) {
 	// String reviewName = iterator.next();
 	// fFactory.openR4EReview(loadedGroup, reviewName);
@@ -383,8 +383,8 @@ public class R4EReviewGroupTest extends TestCase {
 	// assertNotNull(tomReviews);
 	// assertNotNull(jerryReviews);
 	//
-	// EList<String> createdByTom = tomReviews.getCreatedReviews();
-	// EList<String> createdByJerry = jerryReviews.getCreatedReviews();
+	// List<String> createdByTom = tomReviews.getCreatedReviews();
+	// List<String> createdByJerry = jerryReviews.getCreatedReviews();
 	//
 	// Set<String> tomInvitedTo = tomReviews.getInvitedToMap().keySet();
 	// Set<String> jerryInvitedTo = jerryReviews.getInvitedToMap().keySet();
@@ -407,7 +407,7 @@ public class R4EReviewGroupTest extends TestCase {
 	// File goldenFolder = new File(folderPath);
 	// @SuppressWarnings("unchecked")
 	// Collection<File> files = FileUtils.listFiles(goldenFolder, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
-	// EList<Resource> resources = loadedGroup.eResource().getResourceSet().getResources();
+	// List<Resource> resources = loadedGroup.eResource().getResourceSet().getResources();
 	// boolean goodNumResources = (files.size() == resources.size());
 	// if (!goodNumResources) {
 	// System.out.println("Unexpected number of resources found: ");
@@ -432,7 +432,7 @@ public class R4EReviewGroupTest extends TestCase {
 	// assertNotNull(((R4EReview) loadedGroup.getReviews().get(0)).getName());
 	//
 	// // Verify Reviews Ids Map
-	// EList<Review> reviews = loadedGroup.getReviews();
+	// List<Review> reviews = loadedGroup.getReviews();
 	// R4EReview review = null;
 	// for (Iterator<Review> iterator = reviews.iterator(); iterator.hasNext();) {
 	// R4EReview tmpReview = (R4EReview) iterator.next();
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/utils/CommonModelFileConverterTest.java b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/utils/CommonModelFileConverterTest.java
new file mode 100644
index 00000000..a493345f
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/src/org/eclipse/mylyn/reviews/r4e/core/utils/CommonModelFileConverterTest.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2010, 2012 Ericsson
+ *  
+ * 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
+ * 
+ * Description:
+ * 
+ * Contributors:
+ * Miles Parker  - Initial implementation
+ * 
+ */
+package org.eclipse.mylyn.reviews.r4e.core.utils;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.io.FileUtils;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.mylyn.reviews.core.model.IReview;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.BasePersistenceTest;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
+import org.junit.Test;
+
+public class CommonModelFileConverterTest extends BasePersistenceTest {
+
+	private R4EReviewGroup oldGroup;
+
+	public static final String OLD_GROUP_PATH_STR = "outGroupPrior";
+
+	public static final String OLD_GROUP_DIR_STR = "stubs_model/" + OLD_GROUP_PATH_STR;
+
+	public static final String OLD_GROUP_FILE_STR = OLD_GROUP_DIR_STR + "/Golden_Group_group_root.xrer";
+
+	public static final URI OLD_GROUP_FILE = URI.createFileURI(OLD_GROUP_FILE_STR);
+
+	@Test
+	public void testConversion() throws ResourceHandlingException, CompatibilityException, IOException {
+		keepFiles = true;
+
+		// Take the directory name to be used as copy destination
+		File goldenDir = new File(URI.decode(OLD_GROUP_FILE.trimSegments(1).devicePath()));
+		String testDir = fRootTestDir.toString() + File.separator + "OutL1" + fSep + "OutL2" + fSep
+				+ goldenDir.getName();
+		File oldTestDir = new File(testDir);
+
+		// Determine the location of the group file in the destination folder
+		URI oldTestRootURI = URI.createFileURI(oldTestDir.getAbsolutePath());
+		String rootFile = fGoldenGroup.lastSegment();
+		URI oldTestGroupFileURI = oldTestRootURI.appendSegment(rootFile);
+
+		// Copy golden dir to test dir
+		FileUtils.copyDirectory(goldenDir, oldTestDir);
+
+		oldGroup = (R4EReviewGroup) fResFactory.openR4EReviewGroup(oldTestGroupFileURI);
+		// Load
+		try {
+			R4EReview oldReview = fResFactory.openR4EReview(oldGroup, "Review1");
+			fail();
+		} catch (Exception e) {
+			assertTrue("Actual Message: " + e.getMessage(), e.getMessage().contains("IllegalValueException"));
+		}
+		CommonModelFileConverter converter = new CommonModelFileConverter(oldTestRootURI);
+		converter.schedule();
+		long elapsed = 0;
+		while (converter.getResult() == null) {
+			if (elapsed > 20000) {
+				fail("Timeout for conversion.");
+			}
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+			elapsed++;
+		}
+		assertTrue(converter.getResult().getMessage(), converter.getResult().isOK());
+
+		R4EReviewGroup newGroup = (R4EReviewGroup) fResFactory.openR4EReviewGroup(oldTestGroupFileURI);
+		R4EReview newReview = fResFactory.openR4EReview(newGroup, "Review1");
+		assertNotNull(newReview);
+		for (IReview review : newGroup.getReviews()) {
+			fResFactory.openR4EReview(newGroup, review.getId());
+		}
+		//keepFiles = false;
+	}
+}
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs/org/eclipse/mylyn/reviews/r4e/core/model/impl/GroupSampl.java b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs/org/eclipse/mylyn/reviews/r4e/core/model/impl/GroupSampl.java
index 42a2afdd..d01a7172 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs/org/eclipse/mylyn/reviews/r4e/core/model/impl/GroupSampl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs/org/eclipse/mylyn/reviews/r4e/core/model/impl/GroupSampl.java
@@ -17,8 +17,8 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Map;
 
-import org.eclipse.emf.common.util.EMap;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
@@ -38,7 +38,7 @@ public class GroupSampl {
 
 	private final static String _DEFAULT_ENTRY_CRITERIA = "-Entry Criteria";
 
-	private final static String _VERSION = "0.8.0";
+	private final static String _VERSION = "0.13.0";
 
 	private final static String[] _AVAILABLE_PROJECTS = new String[] { "P1", "P2", "P3" };
 
@@ -103,7 +103,7 @@ public class GroupSampl {
 		// LOCAL REFERENCES
 		R4EAnomalyType anomalyTypeTemplate;
 		R4EAnomalyType anomalyTypeReference;
-		EMap<String, R4EAnomalyType> anomalyTypeMap = fgroup.getAnomalyTypeKeyToReference();
+		Map<String, R4EAnomalyType> anomalyTypMap = fgroup.getAnomalyTypeKeyToReference();
 		for (String type : _AVAILABLE_ANOMALY_TYPES) {
 			anomalyTypeTemplate = RModelFactoryExt.eINSTANCE.createR4EAnomalyType();
 			anomalyTypeReference = RModelFactoryExt.eINSTANCE.createR4EAnomalyType();
@@ -115,7 +115,7 @@ public class GroupSampl {
 			fgroup.getAvailableAnomalyTypes().add(anomalyTypeTemplate);
 
 			// RWCommon reference used when creating anomalies
-			anomalyTypeMap.put(type, anomalyTypeReference);
+			anomalyTypMap.put(type, anomalyTypeReference);
 		}
 
 		try {
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs/org/eclipse/mylyn/reviews/r4e/core/model/impl/ReviewSampl.java b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs/org/eclipse/mylyn/reviews/r4e/core/model/impl/ReviewSampl.java
index b307ebf1..e72860a9 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs/org/eclipse/mylyn/reviews/r4e/core/model/impl/ReviewSampl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs/org/eclipse/mylyn/reviews/r4e/core/model/impl/ReviewSampl.java
@@ -22,10 +22,8 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
@@ -90,23 +88,23 @@ public class ReviewSampl {
 		fReview.setStartDate(startDate);
 		fReview.setEndDate(endDate);
 
-		EList<String> projects = aGroup.getAvailableProjects();
+		List<String> projects = aGroup.getAvailableProjects();
 		String project = "TBD";
 		if (projects != null && projects.size() > 0) {
 			project = projects.get(0);
 		}
 
-		EList<String> components = aGroup.getAvailableComponents();
+		List<String> components = aGroup.getAvailableComponents();
 		String component = "TBD";
 		if (components != null && components.size() > 0) {
 			component = components.get(0);
 		}
 
 		R4EReviewDecision decision = RModelFactory.eINSTANCE.createR4EReviewDecision();
-		decision.setValue(R4EDecision.R4E_REVIEW_DECISION_ACCEPTED);
+		decision.setValue(R4EDecision.ACCEPTED);
 
 		List<R4EUserRole> roles = new ArrayList<R4EUserRole>();
-		roles.add(R4EUserRole.R4E_ROLE_LEAD);
+		roles.add(R4EUserRole.LEAD);
 		int value = 0;
 		R4EParticipant participant = null;
 		try {
@@ -123,8 +121,7 @@ public class ReviewSampl {
 		participant.getGroupPaths().add("c:/users/test/group2/");
 
 		Collection<Integer> userTimes = participant.getTimeLog().values();
-		for (Iterator<Integer> iterator = userTimes.iterator(); iterator.hasNext();) {
-			Integer time = iterator.next();
+		for (Integer time : userTimes) {
 			value += time;
 		}
 
@@ -142,8 +139,7 @@ public class ReviewSampl {
 		participant2.getGroupPaths().add("c:/group2/");
 
 		userTimes = participant2.getTimeLog().values();
-		for (Iterator<Integer> iterator = userTimes.iterator(); iterator.hasNext();) {
-			Integer time = iterator.next();
+		for (Integer time : userTimes) {
 			value += time;
 		}
 
@@ -167,7 +163,7 @@ public class ReviewSampl {
 		fReview.setObjectives("Sample Objectives");
 		fReview.setReferenceMaterial("sample reference material");
 		fReview.setEndDate(endDate);
-		fReview.setType(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL);
+		fReview.setType(R4EReviewType.INFORMAL);
 
 		// REFERENCES LOCAL
 		decision.setSpentTime(value);
@@ -175,7 +171,7 @@ public class ReviewSampl {
 
 		// REFERENCES - SUPERTYPE
 		R4EReviewState revState = RModelFactory.eINSTANCE.createR4EReviewState();
-		revState.setState(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION);
+		revState.setState(R4EReviewPhase.PREPARATION);
 		fReview.setState(revState);
 
 		R4ETaskReference task = RModelFactory.eINSTANCE.createR4ETaskReference();
@@ -223,7 +219,7 @@ public class ReviewSampl {
 		// Additional comments from two users on the same anomaly
 		// Comments
 		R4ECommentType commType = RModelFactory.eINSTANCE.createR4ECommentType();
-		commType.setType(R4EDesignRuleClass.R4E_CLASS_ERRONEOUS);
+		commType.setType(R4EDesignRuleClass.ERRONEOUS);
 
 		// comment1
 		R4EComment comment1 = null;
@@ -270,7 +266,7 @@ public class ReviewSampl {
 				item.setSubmitted(submittedDate);
 
 				R4EFileContext context = fResFactory.createR4EFileContext(item);
-				context.setType(R4EContextType.R4E_ADDED);
+				context.setType(R4EContextType.ADDED);
 
 				R4EFileVersion fvBase = fResFactory.createR4EBaseFileVersion(context);
 				fvBase.setName("file_" + i);
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Golden_Group_group_root.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Golden_Group_group_root.xrer
new file mode 100755
index 00000000..2a2dc478
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Golden_Group_group_root.xrer
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<r4ecore:R4EReviewGroup xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_UQxKYERPEeC0spkCnDexvg" description="This is sample description - Group level" name="Golden Group" defaultEntryCriteria="-Entry Criteria">
+  <reviewGroupTask xsi:type="r4ecore:R4ETaskReference" xmi:id="_ozavEERPEeC0spkCnDexvg" taskId="324327" repositoryURL="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324327"/>
+  <availableProjects>P1</availableProjects>
+  <availableProjects>P2</availableProjects>
+  <availableProjects>P3</availableProjects>
+  <availableComponents>Component1</availableComponents>
+  <availableComponents>Component2</availableComponents>
+  <availableComponents>Component3</availableComponents>
+  <designRuleLocations xsi:nil="true"/>
+  <availableAnomalyTypes xmi:id="_ozj5AERPEeC0spkCnDexvg" type="Erroneous"/>
+  <availableAnomalyTypes xmi:id="_ozlHIURPEeC0spkCnDexvg" type="Superflous"/>
+  <availableAnomalyTypes xmi:id="_ozlHI0RPEeC0spkCnDexvg" type="Improvement"/>
+  <availableAnomalyTypes xmi:id="_ozlHJURPEeC0spkCnDexvg" type="Question"/>
+</r4ecore:R4EReviewGroup>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Jerry20_group_reviews.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Jerry20_group_reviews.xrer
new file mode 100755
index 00000000..03cc06bc
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Jerry20_group_reviews.xrer
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ASCII"?>
+<r4ecore:R4EUserReviews xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_o_mw8kRPEeC0spkCnDexvg" name="Jerry20">
+  <invitedToMap xmi:id="_o_mw9ERPEeC0spkCnDexvg" key="ReviewSampl">
+    <value href="ReviewSampl/ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+  </invitedToMap>
+  <invitedToMap xmi:id="_pLWG5ERPEeC0spkCnDexvg" key="ReviewTwo">
+    <value href="ReviewTwo/ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+  </invitedToMap>
+  <group href="Golden_Group_group_root.xrer#_UQxKYERPEeC0spkCnDexvg"/>
+</r4ecore:R4EUserReviews>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Review1/Review1_review.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Review1/Review1_review.xrer
new file mode 100644
index 00000000..147225e8
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Review1/Review1_review.xrer
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_ozvfMERPEeC0spkCnDexvg" fragmentVersion="0.12.0" name="Review1" startDate="1867-06-30T21:00:00.000-0800" endDate="1867-07-02T21:00:00.000-0800">
+  <state xsi:type="r4ecore:R4EReviewState" xmi:id="_o3kPQERPEeC0spkCnDexvg"/>
+  <createdBy href="lmcalvs_comments.xrer#_oz8TgURPEeC0spkCnDexvg"/>
+</r4ecore:R4EReview>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Review1/lmcalvs_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Review1/lmcalvs_comments.xrer
new file mode 100644
index 00000000..4ccafe87
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Review1/lmcalvs_comments.xrer
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ASCII"?>
+<r4ecore:R4EParticipant xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_oz8TgURPEeC0spkCnDexvg" id="lmcalvs" reviewCreatedByMe="true">
+  <reviewInstance href="Review1_review.xrer#_ozvfMERPEeC0spkCnDexvg"/>
+  <roles>R4E_ROLE_ORGANIZER</roles>
+</r4ecore:R4EParticipant>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Jerry20_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Jerry20_comments.xrer
new file mode 100644
index 00000000..2045b509
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Jerry20_comments.xrer
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/">
+  <r4ecore:R4EParticipant xmi:id="_o_mw8URPEeC0spkCnDexvg" id="Jerry20" sequenceIDCounter="15" focusArea="Feature" isPartOfDecision="true">
+    <addedComments href="#_pDNekERPEeC0spkCnDexvg"/>
+    <addedComments href="#_pDekUERPEeC0spkCnDexvg"/>
+    <addedComments href="#_pDgZgURPEeC0spkCnDexvg"/>
+    <addedItems href="Jerry20_items.xrer#_pF_s0URPEeC0spkCnDexvg"/>
+    <addedItems href="Jerry20_items.xrer#_pH6YYURPEeC0spkCnDexvg"/>
+    <addedItems href="Jerry20_items.xrer#_pIEJYURPEeC0spkCnDexvg"/>
+    <addedItems href="Jerry20_items.xrer#_pIausERPEeC0spkCnDexvg"/>
+    <reviewInstance href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <roles>R4E_ROLE_LEAD</roles>
+    <timeLog xmi:id="_pCTfoERPEeC0spkCnDexvg" key="1867-07-01T00:00:00.000-0500" value="30"/>
+    <timeLog xmi:id="_pCTfoURPEeC0spkCnDexvg" key="1867-07-03T00:00:00.000-0500" value="30"/>
+  </r4ecore:R4EParticipant>
+  <r4ecore:R4EAnomaly xmi:id="_pDNekERPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+    <location xsi:type="r4ecore:R4ETextContent" href="#_pDOssERPEeC0spkCnDexvg"/>
+    <id xmi:id="_pDNekURPEeC0spkCnDexvg" sequenceID="1" userID="Jerry20"/>
+  </r4ecore:R4EAnomaly>
+  <r4ecore:R4ETextContent xmi:id="_pDOssERPEeC0spkCnDexvg" info="Write any information here">
+    <location href="#_pDPTwERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4EAnomalyTextPosition xmi:id="_pDPTwERPEeC0spkCnDexvg" startPosition="1230" length="40" startLine="50" endLine="100">
+    <file href="#_pDP60ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EAnomalyTextPosition>
+  <r4ecore:R4EFileVersion xmi:id="_pDP60ERPEeC0spkCnDexvg" platformURI="platform:/resource/projName/src/dir1/dir2" versionID="8" repositoryPath="/Dir1/Dir2" name="R4ETestFile"/>
+  <r4ecore:R4EComment xmi:id="_pDekUERPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.933-0500">
+    <id xmi:id="_pDekUURPEeC0spkCnDexvg" sequenceID="2" userID="Jerry20"/>
+    <anomaly href="Tom10_comments.xrer#_pCpd4ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EComment>
+  <r4ecore:R4EComment xmi:id="_pDgZgURPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.936-0500">
+    <type xsi:type="r4ecore:R4ECommentType" xmi:id="_pDgZgERPEeC0spkCnDexvg"/>
+    <id xmi:id="_pDgZgkRPEeC0spkCnDexvg" sequenceID="3" userID="Jerry20"/>
+    <anomaly href="Tom10_comments.xrer#_pCpd4ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EComment>
+</xmi:XMI>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Jerry20_items.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Jerry20_items.xrer
new file mode 100644
index 00000000..1c8ab0c2
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Jerry20_items.xrer
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/">
+  <r4ecore:R4EItem xmi:id="_pF_s0URPEeC0spkCnDexvg" description="Jerry20-Item to review 11" addedById="Jerry20" repositoryRef="repository ref..0" authorRep="changeAuthor_0" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pF_s0kRPEeC0spkCnDexvg" sequenceID="4" userID="Jerry20"/>
+    <addedBy href="Jerry20_comments.xrer#_o_mw8URPEeC0spkCnDexvg"/>
+    <review href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pH0RwERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX0</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pH0RwERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pH0RwURPEeC0spkCnDexvg" sequenceID="5" userID="Jerry20"/>
+    <deltas href="#_pH3VEkRPEeC0spkCnDexvg"/>
+    <base href="#_pH040ERPEeC0spkCnDexvg"/>
+    <target href="#_pH3VEERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pH040ERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="1004019327" repositoryPath="root/folder_0" name="file_0" localVersionID="locIdB_1234_0"/>
+  <r4ecore:R4EFileVersion xmi:id="_pH3VEERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="1004019328" repositoryPath="root/folder_0" name="file_0" localVersionID="locIdT_1234_0"/>
+  <r4ecore:R4EDelta xmi:id="_pH3VEkRPEeC0spkCnDexvg">
+    <id xmi:id="_pH3VE0RPEeC0spkCnDexvg" sequenceID="6" userID="Jerry20"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pH4jMERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pH5xUERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pH4jMERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pH5KQERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pH5KQERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pH5xUERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pH5xUURPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pH5xUURPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pH6YYURPEeC0spkCnDexvg" description="Jerry20-Item to review 12" addedById="Jerry20" repositoryRef="repository ref..1" authorRep="changeAuthor_1" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pH6YYkRPEeC0spkCnDexvg" sequenceID="7" userID="Jerry20"/>
+    <addedBy href="Jerry20_comments.xrer#_o_mw8URPEeC0spkCnDexvg"/>
+    <review href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pH-CwERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX1</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pH-CwERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pH-CwURPEeC0spkCnDexvg" sequenceID="8" userID="Jerry20"/>
+    <deltas href="#_pH_38URPEeC0spkCnDexvg"/>
+    <base href="#_pH-p0ERPEeC0spkCnDexvg"/>
+    <target href="#_pH_Q4ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pH-p0ERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="1004019328" repositoryPath="root/folder_1" name="file_1" localVersionID="locIdB_1234_1"/>
+  <r4ecore:R4EFileVersion xmi:id="_pH_Q4ERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="1004019329" repositoryPath="root/folder_1" name="file_1" localVersionID="locIdT_1234_1"/>
+  <r4ecore:R4EDelta xmi:id="_pH_38URPEeC0spkCnDexvg">
+    <id xmi:id="_pH_38kRPEeC0spkCnDexvg" sequenceID="9" userID="Jerry20"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pIBGEERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pIC7QERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pIBGEERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pIBtIERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pIBtIERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pIC7QERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pIDiUERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pIDiUERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pIEJYURPEeC0spkCnDexvg" description="Jerry20-Item to review 21" addedById="Jerry20" repositoryRef="repository ref..2" authorRep="changeAuthor_2" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pIEJYkRPEeC0spkCnDexvg" sequenceID="10" userID="Jerry20"/>
+    <addedBy href="Jerry20_comments.xrer#_o_mw8URPEeC0spkCnDexvg"/>
+    <review href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pIHzwERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX2</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pIHzwERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pIHzwURPEeC0spkCnDexvg" sequenceID="11" userID="Jerry20"/>
+    <deltas href="#_pIJo8URPEeC0spkCnDexvg"/>
+    <base href="#_pIIa0ERPEeC0spkCnDexvg"/>
+    <target href="#_pIJB4ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pIIa0ERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="1004019358" repositoryPath="root/folder_2" name="file_2" localVersionID="locIdB_1234_2"/>
+  <r4ecore:R4EFileVersion xmi:id="_pIJB4ERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="1004019359" repositoryPath="root/folder_2" name="file_2" localVersionID="locIdT_1234_2"/>
+  <r4ecore:R4EDelta xmi:id="_pIJo8URPEeC0spkCnDexvg">
+    <id xmi:id="_pIJo8kRPEeC0spkCnDexvg" sequenceID="12" userID="Jerry20"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pIPvkERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pIV2MERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pIPvkERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pIQ9sERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pIQ9sERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pIV2MERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pIY5gERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pIY5gERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pIausERPEeC0spkCnDexvg" description="Jerry20-Item to review 22" addedById="Jerry20" repositoryRef="repository ref..3" authorRep="changeAuthor_3" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pIausURPEeC0spkCnDexvg" sequenceID="13" userID="Jerry20"/>
+    <addedBy href="Jerry20_comments.xrer#_o_mw8URPEeC0spkCnDexvg"/>
+    <review href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pIdK8ERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX3</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pIdK8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pIdK8URPEeC0spkCnDexvg" sequenceID="14" userID="Jerry20"/>
+    <deltas href="#_pIlt0URPEeC0spkCnDexvg"/>
+    <base href="#_pIiqgERPEeC0spkCnDexvg"/>
+    <target href="#_pIkfsERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pIiqgERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="1004019359" repositoryPath="root/folder_3" name="file_3" localVersionID="locIdB_1234_3"/>
+  <r4ecore:R4EFileVersion xmi:id="_pIkfsERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="1004019360" repositoryPath="root/folder_3" name="file_3" localVersionID="locIdT_1234_3"/>
+  <r4ecore:R4EDelta xmi:id="_pIlt0URPEeC0spkCnDexvg">
+    <id xmi:id="_pIlt0kRPEeC0spkCnDexvg" sequenceID="15" userID="Jerry20"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pImU4ERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pI0-YERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pImU4ERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pIzJMERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pIzJMERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pI0-YERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pI0-YURPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pI0-YURPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+</xmi:XMI>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/ReviewSampl_review.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/ReviewSampl_review.xrer
new file mode 100644
index 00000000..6565ad53
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/ReviewSampl_review.xrer
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ASCII"?>
+<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_o6x7UERPEeC0spkCnDexvg" name="ReviewSampl" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="R4E_REVIEW_TYPE_INFORMAL">
+  <reviewTask xsi:type="r4ecore:R4ETaskReference" xmi:id="_pI2zkkRPEeC0spkCnDexvg" taskId="324328" repositoryURL="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324328"/>
+  <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pI2zkURPEeC0spkCnDexvg" state="R4E_REVIEW_PHASE_PREPARATION"/>
+  <components>Component1</components>
+  <decision xmi:id="_pI2zkERPEeC0spkCnDexvg" spentTime="120" value="R4E_REVIEW_DECISION_ACCEPTED"/>
+  <createdBy href="Tom10_comments.xrer#_o6yiYkRPEeC0spkCnDexvg"/>
+</r4ecore:R4EReview>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Tom10_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Tom10_comments.xrer
new file mode 100644
index 00000000..2dda2d88
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Tom10_comments.xrer
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/">
+  <r4ecore:R4EParticipant xmi:id="_o6yiYkRPEeC0spkCnDexvg" id="Tom10" sequenceIDCounter="15" reviewCreatedByMe="true" focusArea="Performance" isPartOfDecision="true">
+    <addedComments href="#_pCpd4ERPEeC0spkCnDexvg"/>
+    <addedComments href="#_pDbhAERPEeC0spkCnDexvg"/>
+    <addedComments href="#_pDcvIURPEeC0spkCnDexvg"/>
+    <addedItems href="Tom10_items.xrer#_pDrYoERPEeC0spkCnDexvg"/>
+    <addedItems href="Tom10_items.xrer#_pFBccURPEeC0spkCnDexvg"/>
+    <addedItems href="Tom10_items.xrer#_pFZ28URPEeC0spkCnDexvg"/>
+    <addedItems href="Tom10_items.xrer#_pFsx4URPEeC0spkCnDexvg"/>
+    <reviewInstance href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <roles>R4E_ROLE_ORGANIZER</roles>
+    <roles>R4E_ROLE_LEAD</roles>
+    <timeLog xmi:id="_o_li0ERPEeC0spkCnDexvg" key="1867-07-01T00:00:00.000-0500" value="30"/>
+    <timeLog xmi:id="_o_li0URPEeC0spkCnDexvg" key="1867-07-03T00:00:00.000-0500" value="30"/>
+  </r4ecore:R4EParticipant>
+  <r4ecore:R4EAnomaly xmi:id="_pCpd4ERPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+    <location xsi:type="r4ecore:R4ETextContent" href="#_pC4HYERPEeC0spkCnDexvg"/>
+    <id xmi:id="_pCshMERPEeC0spkCnDexvg" sequenceID="1" userID="Tom10"/>
+  </r4ecore:R4EAnomaly>
+  <r4ecore:R4ETextContent xmi:id="_pC4HYERPEeC0spkCnDexvg" info="Write any information here">
+    <location href="#_pDH_AERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4EAnomalyTextPosition xmi:id="_pDH_AERPEeC0spkCnDexvg" startPosition="1230" length="40" startLine="50" endLine="100">
+    <file href="#_pDMQcERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EAnomalyTextPosition>
+  <r4ecore:R4EFileVersion xmi:id="_pDMQcERPEeC0spkCnDexvg" platformURI="platform:/resource/projName/src/dir1/dir2" versionID="8" repositoryPath="/Dir1/Dir2" name="R4ETestFile"/>
+  <r4ecore:R4EComment xmi:id="_pDbhAERPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.928-0500">
+    <id xmi:id="_pDbhAURPEeC0spkCnDexvg" sequenceID="2" userID="Tom10"/>
+    <anomaly href="Jerry20_comments.xrer#_pDNekERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EComment>
+  <r4ecore:R4EComment xmi:id="_pDcvIURPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.930-0500">
+    <type xsi:type="r4ecore:R4ECommentType" xmi:id="_pDcvIERPEeC0spkCnDexvg"/>
+    <id xmi:id="_pDcvIkRPEeC0spkCnDexvg" sequenceID="3" userID="Tom10"/>
+    <anomaly href="Jerry20_comments.xrer#_pDNekERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EComment>
+</xmi:XMI>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Tom10_items.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Tom10_items.xrer
new file mode 100644
index 00000000..40033314
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewSampl/Tom10_items.xrer
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/">
+  <r4ecore:R4EItem xmi:id="_pDrYoERPEeC0spkCnDexvg" description="Tom10-Item to review 11" addedById="Tom10" repositoryRef="repository ref..0" authorRep="changeAuthor_0" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pDrYoURPEeC0spkCnDexvg" sequenceID="4" userID="Tom10"/>
+    <addedBy href="Tom10_comments.xrer#_o6yiYkRPEeC0spkCnDexvg"/>
+    <review href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pEt6cERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX0</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pEt6cERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pEt6cURPEeC0spkCnDexvg" sequenceID="5" userID="Tom10"/>
+    <deltas href="#_pE3EYURPEeC0spkCnDexvg"/>
+    <base href="#_pEuhgERPEeC0spkCnDexvg"/>
+    <target href="#_pEvIkERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pEuhgERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="-719978412" repositoryPath="root/folder_0" name="file_0" localVersionID="locIdB_1234_0"/>
+  <r4ecore:R4EFileVersion xmi:id="_pEvIkERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="-719978411" repositoryPath="root/folder_0" name="file_0" localVersionID="locIdT_1234_0"/>
+  <r4ecore:R4EDelta xmi:id="_pE3EYURPEeC0spkCnDexvg">
+    <id xmi:id="_pE3EYkRPEeC0spkCnDexvg" sequenceID="6" userID="Tom10"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pE4SgERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pE_nQERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pE4SgERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pE5goERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pE5goERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pE_nQERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pFAOUERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pFAOUERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pFBccURPEeC0spkCnDexvg" description="Tom10-Item to review 12" addedById="Tom10" repositoryRef="repository ref..1" authorRep="changeAuthor_1" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pFBcckRPEeC0spkCnDexvg" sequenceID="7" userID="Tom10"/>
+    <addedBy href="Tom10_comments.xrer#_o6yiYkRPEeC0spkCnDexvg"/>
+    <review href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pFIKIERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX1</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pFIKIERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pFIKIURPEeC0spkCnDexvg" sequenceID="8" userID="Tom10"/>
+    <deltas href="#_pFL0gURPEeC0spkCnDexvg"/>
+    <base href="#_pFJ_UERPEeC0spkCnDexvg"/>
+    <target href="#_pFKmYERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pFJ_UERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="-719978411" repositoryPath="root/folder_1" name="file_1" localVersionID="locIdB_1234_1"/>
+  <r4ecore:R4EFileVersion xmi:id="_pFKmYERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="-719978410" repositoryPath="root/folder_1" name="file_1" localVersionID="locIdT_1234_1"/>
+  <r4ecore:R4EDelta xmi:id="_pFL0gURPEeC0spkCnDexvg">
+    <id xmi:id="_pFL0gkRPEeC0spkCnDexvg" sequenceID="9" userID="Tom10"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pFMbkERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pFU-cERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pFMbkERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pFNCoERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pFNCoERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pFU-cERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pFWMkERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pFWMkERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pFZ28URPEeC0spkCnDexvg" description="Tom10-Item to review 21" addedById="Tom10" repositoryRef="repository ref..2" authorRep="changeAuthor_2" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pFZ28kRPEeC0spkCnDexvg" sequenceID="10" userID="Tom10"/>
+    <addedBy href="Tom10_comments.xrer#_o6yiYkRPEeC0spkCnDexvg"/>
+    <review href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pFbsIERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX2</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pFbsIERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pFbsIURPEeC0spkCnDexvg" sequenceID="11" userID="Tom10"/>
+    <deltas href="#_pFhLsURPEeC0spkCnDexvg"/>
+    <base href="#_pFfWgERPEeC0spkCnDexvg"/>
+    <target href="#_pFf9kERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pFfWgERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="-719978381" repositoryPath="root/folder_2" name="file_2" localVersionID="locIdB_1234_2"/>
+  <r4ecore:R4EFileVersion xmi:id="_pFf9kERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="-719978380" repositoryPath="root/folder_2" name="file_2" localVersionID="locIdT_1234_2"/>
+  <r4ecore:R4EDelta xmi:id="_pFhLsURPEeC0spkCnDexvg">
+    <id xmi:id="_pFhLskRPEeC0spkCnDexvg" sequenceID="12" userID="Tom10"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pFjA4ERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pFldIERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pFjA4ERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pFkPAERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pFkPAERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pFldIERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pFrjwERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pFrjwERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pFsx4URPEeC0spkCnDexvg" description="Tom10-Item to review 22" addedById="Tom10" repositoryRef="repository ref..3" authorRep="changeAuthor_3" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pFsx4kRPEeC0spkCnDexvg" sequenceID="13" userID="Tom10"/>
+    <addedBy href="Tom10_comments.xrer#_o6yiYkRPEeC0spkCnDexvg"/>
+    <review href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pFv1MERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX3</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pFv1MERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pFv1MURPEeC0spkCnDexvg" sequenceID="14" userID="Tom10"/>
+    <deltas href="#_pF1UwURPEeC0spkCnDexvg"/>
+    <base href="#_pFxDUERPEeC0spkCnDexvg"/>
+    <target href="#_pFxqYERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pFxDUERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="-719978380" repositoryPath="root/folder_3" name="file_3" localVersionID="locIdB_1234_3"/>
+  <r4ecore:R4EFileVersion xmi:id="_pFxqYERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="-719978379" repositoryPath="root/folder_3" name="file_3" localVersionID="locIdT_1234_3"/>
+  <r4ecore:R4EDelta xmi:id="_pF1UwURPEeC0spkCnDexvg">
+    <id xmi:id="_pF1UwkRPEeC0spkCnDexvg" sequenceID="15" userID="Tom10"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pF2i4ERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pF4YEERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pF2i4ERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pF3xAERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pF3xAERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pF4YEERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pF5mMERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pF5mMERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+</xmi:XMI>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Jerry20_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Jerry20_comments.xrer
new file mode 100644
index 00000000..5cb11de3
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Jerry20_comments.xrer
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/">
+  <r4ecore:R4EParticipant xmi:id="_pLWG40RPEeC0spkCnDexvg" id="Jerry20" sequenceIDCounter="15" focusArea="Feature" isPartOfDecision="true">
+    <addedComments href="#_pNATwERPEeC0spkCnDexvg"/>
+    <addedComments href="#_pNDXEERPEeC0spkCnDexvg"/>
+    <addedComments href="#_pNGaYERPEeC0spkCnDexvg"/>
+    <addedItems href="Jerry20_items.xrer#_pOp5kERPEeC0spkCnDexvg"/>
+    <addedItems href="Jerry20_items.xrer#_pQQcEURPEeC0spkCnDexvg"/>
+    <addedItems href="Jerry20_items.xrer#_pQXw0URPEeC0spkCnDexvg"/>
+    <addedItems href="Jerry20_items.xrer#_pQhh0URPEeC0spkCnDexvg"/>
+    <reviewInstance href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <roles>R4E_ROLE_LEAD</roles>
+    <timeLog xmi:id="_pM60MERPEeC0spkCnDexvg" key="1867-07-01T00:00:00.000-0500" value="30"/>
+    <timeLog xmi:id="_pM60MURPEeC0spkCnDexvg" key="1867-07-03T00:00:00.000-0500" value="30"/>
+  </r4ecore:R4EParticipant>
+  <r4ecore:R4EAnomaly xmi:id="_pNATwERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+    <location xsi:type="r4ecore:R4ETextContent" href="#_pNA60ERPEeC0spkCnDexvg"/>
+    <id xmi:id="_pNATwURPEeC0spkCnDexvg" sequenceID="1" userID="Jerry20"/>
+  </r4ecore:R4EAnomaly>
+  <r4ecore:R4ETextContent xmi:id="_pNA60ERPEeC0spkCnDexvg" info="Write any information here">
+    <location href="#_pNBh4ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4EAnomalyTextPosition xmi:id="_pNBh4ERPEeC0spkCnDexvg" startPosition="1230" length="40" startLine="50" endLine="100">
+    <file href="#_pNBh4URPEeC0spkCnDexvg"/>
+  </r4ecore:R4EAnomalyTextPosition>
+  <r4ecore:R4EFileVersion xmi:id="_pNBh4URPEeC0spkCnDexvg" platformURI="platform:/resource/projName/src/dir1/dir2" versionID="8" repositoryPath="/Dir1/Dir2" name="R4ETestFile"/>
+  <r4ecore:R4EComment xmi:id="_pNDXEERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.937-0500">
+    <id xmi:id="_pNDXEURPEeC0spkCnDexvg" sequenceID="2" userID="Jerry20"/>
+    <anomaly href="Tom10_comments.xrer#_pM7bQERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EComment>
+  <r4ecore:R4EComment xmi:id="_pNGaYERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.942-0500">
+    <type xsi:type="r4ecore:R4ECommentType" xmi:id="_pNElMERPEeC0spkCnDexvg"/>
+    <id xmi:id="_pNGaYURPEeC0spkCnDexvg" sequenceID="3" userID="Jerry20"/>
+    <anomaly href="Tom10_comments.xrer#_pM7bQERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EComment>
+</xmi:XMI>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Jerry20_items.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Jerry20_items.xrer
new file mode 100644
index 00000000..1a63c1b4
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Jerry20_items.xrer
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/">
+  <r4ecore:R4EItem xmi:id="_pOp5kERPEeC0spkCnDexvg" description="Jerry20-Item to review 11" addedById="Jerry20" repositoryRef="repository ref..0" authorRep="changeAuthor_0" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pOp5kURPEeC0spkCnDexvg" sequenceID="4" userID="Jerry20"/>
+    <addedBy href="Jerry20_comments.xrer#_pLWG40RPEeC0spkCnDexvg"/>
+    <review href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pQNYwERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX0</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pQNYwERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pQNYwURPEeC0spkCnDexvg" sequenceID="5" userID="Jerry20"/>
+    <deltas href="#_pQOm4URPEeC0spkCnDexvg"/>
+    <base href="#_pQN_0ERPEeC0spkCnDexvg"/>
+    <target href="#_pQN_0URPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pQN_0ERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="1004019327" repositoryPath="root/folder_0" name="file_0" localVersionID="locIdB_1234_0"/>
+  <r4ecore:R4EFileVersion xmi:id="_pQN_0URPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="1004019328" repositoryPath="root/folder_0" name="file_0" localVersionID="locIdT_1234_0"/>
+  <r4ecore:R4EDelta xmi:id="_pQOm4URPEeC0spkCnDexvg">
+    <id xmi:id="_pQOm4kRPEeC0spkCnDexvg" sequenceID="6" userID="Jerry20"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pQPN8ERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pQP1AERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pQPN8ERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pQPN8URPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pQPN8URPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pQP1AERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pQP1AURPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pQP1AURPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pQQcEURPEeC0spkCnDexvg" description="Jerry20-Item to review 12" addedById="Jerry20" repositoryRef="repository ref..1" authorRep="changeAuthor_1" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pQQcEkRPEeC0spkCnDexvg" sequenceID="7" userID="Jerry20"/>
+    <addedBy href="Jerry20_comments.xrer#_pLWG40RPEeC0spkCnDexvg"/>
+    <review href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pQS4UERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX1</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pQS4UERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pQS4UURPEeC0spkCnDexvg" sequenceID="8" userID="Jerry20"/>
+    <deltas href="#_pQUtgERPEeC0spkCnDexvg"/>
+    <base href="#_pQTfYERPEeC0spkCnDexvg"/>
+    <target href="#_pQUGcERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pQTfYERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="1004019328" repositoryPath="root/folder_1" name="file_1" localVersionID="locIdB_1234_1"/>
+  <r4ecore:R4EFileVersion xmi:id="_pQUGcERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="1004019329" repositoryPath="root/folder_1" name="file_1" localVersionID="locIdT_1234_1"/>
+  <r4ecore:R4EDelta xmi:id="_pQUtgERPEeC0spkCnDexvg">
+    <id xmi:id="_pQUtgURPEeC0spkCnDexvg" sequenceID="9" userID="Jerry20"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pQUtgkRPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pQV7oERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pQUtgkRPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pQVUkERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pQVUkERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pQV7oERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pQV7oURPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pQV7oURPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pQXw0URPEeC0spkCnDexvg" description="Jerry20-Item to review 21" addedById="Jerry20" repositoryRef="repository ref..2" authorRep="changeAuthor_2" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pQXw0kRPEeC0spkCnDexvg" sequenceID="10" userID="Jerry20"/>
+    <addedBy href="Jerry20_comments.xrer#_pLWG40RPEeC0spkCnDexvg"/>
+    <review href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pQY-8ERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX2</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pQY-8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pQY-8URPEeC0spkCnDexvg" sequenceID="11" userID="Jerry20"/>
+    <deltas href="#_pQaNEkRPEeC0spkCnDexvg"/>
+    <base href="#_pQZmAERPEeC0spkCnDexvg"/>
+    <target href="#_pQaNEERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pQZmAERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="1004019358" repositoryPath="root/folder_2" name="file_2" localVersionID="locIdB_1234_2"/>
+  <r4ecore:R4EFileVersion xmi:id="_pQaNEERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="1004019359" repositoryPath="root/folder_2" name="file_2" localVersionID="locIdT_1234_2"/>
+  <r4ecore:R4EDelta xmi:id="_pQaNEkRPEeC0spkCnDexvg">
+    <id xmi:id="_pQaNE0RPEeC0spkCnDexvg" sequenceID="12" userID="Jerry20"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pQfFkERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pQgTsERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pQfFkERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pQfsoERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pQfsoERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pQgTsERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pQg6wERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pQg6wERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pQhh0URPEeC0spkCnDexvg" description="Jerry20-Item to review 22" addedById="Jerry20" repositoryRef="repository ref..3" authorRep="changeAuthor_3" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pQhh0kRPEeC0spkCnDexvg" sequenceID="13" userID="Jerry20"/>
+    <addedBy href="Jerry20_comments.xrer#_pLWG40RPEeC0spkCnDexvg"/>
+    <review href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pQiv8ERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX3</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pQiv8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pQiv8URPEeC0spkCnDexvg" sequenceID="14" userID="Jerry20"/>
+    <deltas href="#_pQklIERPEeC0spkCnDexvg"/>
+    <base href="#_pQjXAERPEeC0spkCnDexvg"/>
+    <target href="#_pQj-EERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pQjXAERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="1004019359" repositoryPath="root/folder_3" name="file_3" localVersionID="locIdB_1234_3"/>
+  <r4ecore:R4EFileVersion xmi:id="_pQj-EERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="1004019360" repositoryPath="root/folder_3" name="file_3" localVersionID="locIdT_1234_3"/>
+  <r4ecore:R4EDelta xmi:id="_pQklIERPEeC0spkCnDexvg">
+    <id xmi:id="_pQklIURPEeC0spkCnDexvg" sequenceID="15" userID="Jerry20"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pQklIkRPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pQnocERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pQklIkRPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pQnBYERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pQnBYERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pQnocERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pQoPgERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pQoPgERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+</xmi:XMI>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/ReviewTwo_review.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/ReviewTwo_review.xrer
new file mode 100644
index 00000000..174f42f8
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/ReviewTwo_review.xrer
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ASCII"?>
+<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_pI3aoERPEeC0spkCnDexvg" name="ReviewTwo" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="R4E_REVIEW_TYPE_INFORMAL">
+  <reviewTask xsi:type="r4ecore:R4ETaskReference" xmi:id="_pQo2kkRPEeC0spkCnDexvg" taskId="324328" repositoryURL="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324328"/>
+  <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pQo2kURPEeC0spkCnDexvg" state="R4E_REVIEW_PHASE_PREPARATION"/>
+  <components>Component1</components>
+  <decision xmi:id="_pQo2kERPEeC0spkCnDexvg" spentTime="120" value="R4E_REVIEW_DECISION_ACCEPTED"/>
+  <createdBy href="Tom10_comments.xrer#_pI3ao0RPEeC0spkCnDexvg"/>
+</r4ecore:R4EReview>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Tom10_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Tom10_comments.xrer
new file mode 100644
index 00000000..3e166c74
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Tom10_comments.xrer
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/">
+  <r4ecore:R4EParticipant xmi:id="_pI3ao0RPEeC0spkCnDexvg" id="Tom10" sequenceIDCounter="15" reviewCreatedByMe="true" focusArea="Performance" isPartOfDecision="true">
+    <addedComments href="#_pM7bQERPEeC0spkCnDexvg"/>
+    <addedComments href="#_pNCI8ERPEeC0spkCnDexvg"/>
+    <addedComments href="#_pNCwAURPEeC0spkCnDexvg"/>
+    <addedItems href="Tom10_items.xrer#_pNHogURPEeC0spkCnDexvg"/>
+    <addedItems href="Tom10_items.xrer#_pOObwURPEeC0spkCnDexvg"/>
+    <addedItems href="Tom10_items.xrer#_pOUiYURPEeC0spkCnDexvg"/>
+    <addedItems href="Tom10_items.xrer#_pObQEURPEeC0spkCnDexvg"/>
+    <reviewInstance href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <roles>R4E_ROLE_ORGANIZER</roles>
+    <roles>R4E_ROLE_LEAD</roles>
+    <timeLog xmi:id="_pLWG4ERPEeC0spkCnDexvg" key="1867-07-01T00:00:00.000-0500" value="30"/>
+    <timeLog xmi:id="_pLWG4URPEeC0spkCnDexvg" key="1867-07-03T00:00:00.000-0500" value="30"/>
+  </r4ecore:R4EParticipant>
+  <r4ecore:R4EAnomaly xmi:id="_pM7bQERPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+    <location xsi:type="r4ecore:R4ETextContent" href="#_pM93gERPEeC0spkCnDexvg"/>
+    <id xmi:id="_pM7bQURPEeC0spkCnDexvg" sequenceID="1" userID="Tom10"/>
+  </r4ecore:R4EAnomaly>
+  <r4ecore:R4ETextContent xmi:id="_pM93gERPEeC0spkCnDexvg" info="Write any information here">
+    <location href="#_pM-ekERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4EAnomalyTextPosition xmi:id="_pM-ekERPEeC0spkCnDexvg" startPosition="1230" length="40" startLine="50" endLine="100">
+    <file href="#_pM_ssERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EAnomalyTextPosition>
+  <r4ecore:R4EFileVersion xmi:id="_pM_ssERPEeC0spkCnDexvg" platformURI="platform:/resource/projName/src/dir1/dir2" versionID="8" repositoryPath="/Dir1/Dir2" name="R4ETestFile"/>
+  <r4ecore:R4EComment xmi:id="_pNCI8ERPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.935-0500">
+    <id xmi:id="_pNCI8URPEeC0spkCnDexvg" sequenceID="2" userID="Tom10"/>
+    <anomaly href="Jerry20_comments.xrer#_pNATwERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EComment>
+  <r4ecore:R4EComment xmi:id="_pNCwAURPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.936-0500">
+    <type xsi:type="r4ecore:R4ECommentType" xmi:id="_pNCwAERPEeC0spkCnDexvg"/>
+    <id xmi:id="_pNCwAkRPEeC0spkCnDexvg" sequenceID="3" userID="Tom10"/>
+    <anomaly href="Jerry20_comments.xrer#_pNATwERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EComment>
+</xmi:XMI>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Tom10_items.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Tom10_items.xrer
new file mode 100644
index 00000000..b6550537
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/ReviewTwo/Tom10_items.xrer
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/">
+  <r4ecore:R4EItem xmi:id="_pNHogURPEeC0spkCnDexvg" description="Tom10-Item to review 11" addedById="Tom10" repositoryRef="repository ref..0" authorRep="changeAuthor_0" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pNIPkERPEeC0spkCnDexvg" sequenceID="4" userID="Tom10"/>
+    <addedBy href="Tom10_comments.xrer#_pI3ao0RPEeC0spkCnDexvg"/>
+    <review href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pOLYcERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX0</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pOLYcERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pOLYcURPEeC0spkCnDexvg" sequenceID="5" userID="Tom10"/>
+    <deltas href="#_pOMmkURPEeC0spkCnDexvg"/>
+    <base href="#_pOL_gERPEeC0spkCnDexvg"/>
+    <target href="#_pOL_gURPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pOL_gERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="-719978412" repositoryPath="root/folder_0" name="file_0" localVersionID="locIdB_1234_0"/>
+  <r4ecore:R4EFileVersion xmi:id="_pOL_gURPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="-719978411" repositoryPath="root/folder_0" name="file_0" localVersionID="locIdT_1234_0"/>
+  <r4ecore:R4EDelta xmi:id="_pOMmkURPEeC0spkCnDexvg">
+    <id xmi:id="_pOMmkkRPEeC0spkCnDexvg" sequenceID="6" userID="Tom10"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pOMmk0RPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pON0sERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pOMmk0RPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pONNoERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pONNoERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pON0sERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pON0sURPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pON0sURPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pOObwURPEeC0spkCnDexvg" description="Tom10-Item to review 12" addedById="Tom10" repositoryRef="repository ref..1" authorRep="changeAuthor_1" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pOObwkRPEeC0spkCnDexvg" sequenceID="7" userID="Tom10"/>
+    <addedBy href="Tom10_comments.xrer#_pI3ao0RPEeC0spkCnDexvg"/>
+    <review href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pOPC0ERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX1</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pOPC0ERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pOPC0URPEeC0spkCnDexvg" sequenceID="8" userID="Tom10"/>
+    <deltas href="#_pOQQ8kRPEeC0spkCnDexvg"/>
+    <base href="#_pOPp4ERPEeC0spkCnDexvg"/>
+    <target href="#_pOQQ8ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pOPp4ERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="-719978411" repositoryPath="root/folder_1" name="file_1" localVersionID="locIdB_1234_1"/>
+  <r4ecore:R4EFileVersion xmi:id="_pOQQ8ERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="-719978410" repositoryPath="root/folder_1" name="file_1" localVersionID="locIdT_1234_1"/>
+  <r4ecore:R4EDelta xmi:id="_pOQQ8kRPEeC0spkCnDexvg">
+    <id xmi:id="_pOQQ80RPEeC0spkCnDexvg" sequenceID="9" userID="Tom10"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pOQ4AERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pOTUQERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pOQ4AERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pOSGIERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pOSGIERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pOTUQERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pOT7UERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pOT7UERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pOUiYURPEeC0spkCnDexvg" description="Tom10-Item to review 21" addedById="Tom10" repositoryRef="repository ref..2" authorRep="changeAuthor_2" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pOUiYkRPEeC0spkCnDexvg" sequenceID="10" userID="Tom10"/>
+    <addedBy href="Tom10_comments.xrer#_pI3ao0RPEeC0spkCnDexvg"/>
+    <review href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pOVwgERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX2</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pOVwgERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pOVwgURPEeC0spkCnDexvg" sequenceID="11" userID="Tom10"/>
+    <deltas href="#_pOXlsERPEeC0spkCnDexvg"/>
+    <base href="#_pOWXkERPEeC0spkCnDexvg"/>
+    <target href="#_pOW-oERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pOWXkERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="-719978381" repositoryPath="root/folder_2" name="file_2" localVersionID="locIdB_1234_2"/>
+  <r4ecore:R4EFileVersion xmi:id="_pOW-oERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="-719978380" repositoryPath="root/folder_2" name="file_2" localVersionID="locIdT_1234_2"/>
+  <r4ecore:R4EDelta xmi:id="_pOXlsERPEeC0spkCnDexvg">
+    <id xmi:id="_pOXlsURPEeC0spkCnDexvg" sequenceID="12" userID="Tom10"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pOYz0ERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pOaB8ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pOYz0ERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pOZa4ERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pOZa4ERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pOaB8ERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pOapAERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pOapAERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+  <r4ecore:R4EItem xmi:id="_pObQEURPEeC0spkCnDexvg" description="Tom10-Item to review 22" addedById="Tom10" repositoryRef="repository ref..3" authorRep="changeAuthor_3" submitted="1867-07-01T00:00:00.000-0500">
+    <id xmi:id="_pObQEkRPEeC0spkCnDexvg" sequenceID="13" userID="Tom10"/>
+    <addedBy href="Tom10_comments.xrer#_pI3ao0RPEeC0spkCnDexvg"/>
+    <review href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+    <fileContextList href="#_pOceMERPEeC0spkCnDexvg"/>
+    <ProjectURIs>platform:resource/projX3</ProjectURIs>
+  </r4ecore:R4EItem>
+  <r4ecore:R4EFileContext xmi:id="_pOceMERPEeC0spkCnDexvg" type="R4E_ADDED">
+    <id xmi:id="_pOceMURPEeC0spkCnDexvg" sequenceID="14" userID="Tom10"/>
+    <deltas href="#_pOlBEURPEeC0spkCnDexvg"/>
+    <base href="#_pOeTYERPEeC0spkCnDexvg"/>
+    <target href="#_pOh9wERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EFileContext>
+  <r4ecore:R4EFileVersion xmi:id="_pOeTYERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir3/dir4/file.xxx" versionID="-719978380" repositoryPath="root/folder_3" name="file_3" localVersionID="locIdB_1234_3"/>
+  <r4ecore:R4EFileVersion xmi:id="_pOh9wERPEeC0spkCnDexvg" platformURI="platform:/resource/proj/src/dir6/dir7/file.yyy" versionID="-719978379" repositoryPath="root/folder_3" name="file_3" localVersionID="locIdT_1234_3"/>
+  <r4ecore:R4EDelta xmi:id="_pOlBEURPEeC0spkCnDexvg">
+    <id xmi:id="_pOlBEkRPEeC0spkCnDexvg" sequenceID="15" userID="Tom10"/>
+    <base xsi:type="r4ecore:R4ETextContent" href="#_pOmPMERPEeC0spkCnDexvg"/>
+    <target xsi:type="r4ecore:R4ETextContent" href="#_pOndUERPEeC0spkCnDexvg"/>
+  </r4ecore:R4EDelta>
+  <r4ecore:R4ETextContent xmi:id="_pOmPMERPEeC0spkCnDexvg" info="information for base content" content="base content">
+    <location href="#_pOm2QERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pOm2QERPEeC0spkCnDexvg" startPosition="200" length="50" startLine="10" endLine="20"/>
+  <r4ecore:R4ETextContent xmi:id="_pOndUERPEeC0spkCnDexvg" info="information for target content" content="target content">
+    <location href="#_pOorcERPEeC0spkCnDexvg"/>
+  </r4ecore:R4ETextContent>
+  <r4ecore:R4ETextPosition xmi:id="_pOorcERPEeC0spkCnDexvg" startPosition="300" length="100" startLine="30" endLine="40"/>
+</xmi:XMI>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Tom10_group_reviews.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Tom10_group_reviews.xrer
new file mode 100755
index 00000000..0e4eba4f
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/Tom10_group_reviews.xrer
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ASCII"?>
+<r4ecore:R4EUserReviews xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_o6yiY0RPEeC0spkCnDexvg" name="Tom10">
+  <invitedToMap xmi:id="_o6yiZURPEeC0spkCnDexvg" key="ReviewSampl">
+    <value href="ReviewSampl/ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
+  </invitedToMap>
+  <invitedToMap xmi:id="_pI3apERPEeC0spkCnDexvg" key="ReviewTwo">
+    <value href="ReviewTwo/ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
+  </invitedToMap>
+  <group href="Golden_Group_group_root.xrer#_UQxKYERPEeC0spkCnDexvg"/>
+  <createdReviews>ReviewSampl</createdReviews>
+  <createdReviews>ReviewTwo</createdReviews>
+</r4ecore:R4EUserReviews>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/lmcalvs_group_reviews.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/lmcalvs_group_reviews.xrer
new file mode 100755
index 00000000..22580bae
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupPrior/lmcalvs_group_reviews.xrer
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ASCII"?>
+<r4ecore:R4EUserReviews xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_o0CaIERPEeC0spkCnDexvg" name="lmcalvs">
+  <invitedToMap xmi:id="_o0DBMERPEeC0spkCnDexvg" key="Review1">
+    <value href="Review1/Review1_review.xrer#_ozvfMERPEeC0spkCnDexvg"/>
+  </invitedToMap>
+  <group href="Golden_Group_group_root.xrer#_UQxKYERPEeC0spkCnDexvg"/>
+  <createdReviews>Review1</createdReviews>
+</r4ecore:R4EUserReviews>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/Golden_Group_group_root.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/Golden_Group_group_root.xrer
index fe24627c..88b7219b 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/Golden_Group_group_root.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/Golden_Group_group_root.xrer
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>

-<r4ecore:R4EReviewGroup xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_xxzSQERCEeC2DrmWDHmN2w" description="This is sample description - Group level" name="Golden Group" defaultEntryCriteria="-Entry Criteria">

+<r4ecore:R4EReviewGroup xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_xxzSQERCEeC2DrmWDHmN2w" description="This is sample description - Group level" name="Golden Group" fragmentVersion="0.13.0" defaultEntryCriteria="-Entry Criteria">

   <reviewGroupTask xsi:type="r4ecore:R4ETaskReference" xmi:id="_x0s1QERCEeC2DrmWDHmN2w" taskId="324327" repositoryURL="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324327"/>

   <availableProjects>P1</availableProjects>

   <availableProjects>P2</availableProjects>

diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/Review1/Review1_review.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/Review1/Review1_review.xrer
index 70587c2e..88c53afe 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/Review1/Review1_review.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/Review1/Review1_review.xrer
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>

-<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_x0yU0ERCEeC2DrmWDHmN2w" name="Review1" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500">

+<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_x0yU0ERCEeC2DrmWDHmN2w" name="Review1" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" fragmentVersion="0.13.0">

   <state xsi:type="r4ecore:R4EReviewState" xmi:id="_x2N4MERCEeC2DrmWDHmN2w"/>

   <createdBy href="lmcalvs_comments.xrer#_x02mQURCEeC2DrmWDHmN2w"/>

 </r4ecore:R4EReview>

diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/ReviewSampl/ReviewSampl_review.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/ReviewSampl/ReviewSampl_review.xrer
index 6c82db6f..38170113 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/ReviewSampl/ReviewSampl_review.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupW/ReviewSampl/ReviewSampl_review.xrer
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>

-<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_x22KUERCEeC2DrmWDHmN2w" name="ReviewSampl" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="R4E_REVIEW_TYPE_INFORMAL">

+<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_x22KUERCEeC2DrmWDHmN2w" name="ReviewSampl" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" fragmentVersion="0.13.0" type="R4E_REVIEW_TYPE_INFORMAL">

   <reviewTask xsi:type="r4ecore:R4ETaskReference" xmi:id="_yC9TskRCEeC2DrmWDHmN2w" taskId="324328" repositoryURL="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324328"/>

   <state xsi:type="r4ecore:R4EReviewState" xmi:id="_yC9TsURCEeC2DrmWDHmN2w" state="R4E_REVIEW_PHASE_PREPARATION"/>

   <components>Component1</components>

diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Golden_Group_group_root.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Golden_Group_group_root.xrer
index 42b7db36..9c7c69f9 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Golden_Group_group_root.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Golden_Group_group_root.xrer
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>

-<r4ecore:R4EReviewGroup xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_UQxKYERPEeC0spkCnDexvg" description="This is sample description - Group level" name="Golden Group" defaultEntryCriteria="-Entry Criteria">

+<r4ecore:R4EReviewGroup xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_UQxKYERPEeC0spkCnDexvg" description="This is sample description - Group level" name="Golden Group" fragmentVersion="0.13.0" defaultEntryCriteria="-Entry Criteria">

   <reviewGroupTask xsi:type="r4ecore:R4ETaskReference" xmi:id="_ozavEERPEeC0spkCnDexvg" taskId="324327" repositoryURL="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324327"/>

   <availableProjects>P1</availableProjects>

   <availableProjects>P2</availableProjects>

diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Review1/Review1_review.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Review1/Review1_review.xrer
index ddd70318..64f89ce0 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Review1/Review1_review.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Review1/Review1_review.xrer
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_ozvfMERPEeC0spkCnDexvg" name="Review1" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500">
+<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_ozvfMERPEeC0spkCnDexvg" name="Review1" startDate="1867-07-01T00:00:00.000-0500" fragmentVersion="0.13.0" endDate="1867-07-03T00:00:00.000-0500">
   <state xsi:type="r4ecore:R4EReviewState" xmi:id="_o3kPQERPEeC0spkCnDexvg"/>
   <createdBy href="lmcalvs_comments.xrer#_oz8TgURPEeC0spkCnDexvg"/>
 </r4ecore:R4EReview>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Review1/lmcalvs_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Review1/lmcalvs_comments.xrer
index 4ccafe87..939a2231 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Review1/lmcalvs_comments.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/Review1/lmcalvs_comments.xrer
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
 <r4ecore:R4EParticipant xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_oz8TgURPEeC0spkCnDexvg" id="lmcalvs" reviewCreatedByMe="true">
   <reviewInstance href="Review1_review.xrer#_ozvfMERPEeC0spkCnDexvg"/>
-  <roles>R4E_ROLE_ORGANIZER</roles>
+  <roles>ORGANIZER</roles>
 </r4ecore:R4EParticipant>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Jerry20_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Jerry20_comments.xrer
index 2045b509..ee2abd87 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Jerry20_comments.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Jerry20_comments.xrer
@@ -9,12 +9,12 @@
     <addedItems href="Jerry20_items.xrer#_pIEJYURPEeC0spkCnDexvg"/>
     <addedItems href="Jerry20_items.xrer#_pIausERPEeC0spkCnDexvg"/>
     <reviewInstance href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
-    <roles>R4E_ROLE_LEAD</roles>
+    <roles>LEAD</roles>
     <timeLog xmi:id="_pCTfoERPEeC0spkCnDexvg" key="1867-07-01T00:00:00.000-0500" value="30"/>
     <timeLog xmi:id="_pCTfoURPEeC0spkCnDexvg" key="1867-07-03T00:00:00.000-0500" value="30"/>
   </r4ecore:R4EParticipant>
-  <r4ecore:R4EAnomaly xmi:id="_pDNekERPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
-    <location xsi:type="r4ecore:R4ETextContent" href="#_pDOssERPEeC0spkCnDexvg"/>
+  <r4ecore:R4EAnomaly xmi:id="_pDNekERPEeC0spkCnDexvg" author="_o_mw8URPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+    <locations xsi:type="r4ecore:R4ETextContent" href="#_pDOssERPEeC0spkCnDexvg"/>
     <id xmi:id="_pDNekURPEeC0spkCnDexvg" sequenceID="1" userID="Jerry20"/>
   </r4ecore:R4EAnomaly>
   <r4ecore:R4ETextContent xmi:id="_pDOssERPEeC0spkCnDexvg" info="Write any information here">
@@ -24,11 +24,11 @@
     <file href="#_pDP60ERPEeC0spkCnDexvg"/>
   </r4ecore:R4EAnomalyTextPosition>
   <r4ecore:R4EFileVersion xmi:id="_pDP60ERPEeC0spkCnDexvg" platformURI="platform:/resource/projName/src/dir1/dir2" versionID="8" repositoryPath="/Dir1/Dir2" name="R4ETestFile"/>
-  <r4ecore:R4EComment xmi:id="_pDekUERPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.933-0500">
+  <r4ecore:R4EComment xmi:id="_pDekUERPEeC0spkCnDexvg" author="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.933-0500">
     <id xmi:id="_pDekUURPEeC0spkCnDexvg" sequenceID="2" userID="Jerry20"/>
     <anomaly href="Tom10_comments.xrer#_pCpd4ERPEeC0spkCnDexvg"/>
   </r4ecore:R4EComment>
-  <r4ecore:R4EComment xmi:id="_pDgZgURPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.936-0500">
+  <r4ecore:R4EComment xmi:id="_pDgZgURPEeC0spkCnDexvg" author="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.936-0500">
     <type xsi:type="r4ecore:R4ECommentType" xmi:id="_pDgZgERPEeC0spkCnDexvg"/>
     <id xmi:id="_pDgZgkRPEeC0spkCnDexvg" sequenceID="3" userID="Jerry20"/>
     <anomaly href="Tom10_comments.xrer#_pCpd4ERPEeC0spkCnDexvg"/>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Jerry20_items.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Jerry20_items.xrer
index 1c8ab0c2..1d750ad6 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Jerry20_items.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Jerry20_items.xrer
@@ -7,7 +7,7 @@
     <fileContextList href="#_pH0RwERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX0</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pH0RwERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pH0RwERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pH0RwURPEeC0spkCnDexvg" sequenceID="5" userID="Jerry20"/>
     <deltas href="#_pH3VEkRPEeC0spkCnDexvg"/>
     <base href="#_pH040ERPEeC0spkCnDexvg"/>
@@ -35,7 +35,7 @@
     <fileContextList href="#_pH-CwERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX1</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pH-CwERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pH-CwERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pH-CwURPEeC0spkCnDexvg" sequenceID="8" userID="Jerry20"/>
     <deltas href="#_pH_38URPEeC0spkCnDexvg"/>
     <base href="#_pH-p0ERPEeC0spkCnDexvg"/>
@@ -63,7 +63,7 @@
     <fileContextList href="#_pIHzwERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX2</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pIHzwERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pIHzwERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pIHzwURPEeC0spkCnDexvg" sequenceID="11" userID="Jerry20"/>
     <deltas href="#_pIJo8URPEeC0spkCnDexvg"/>
     <base href="#_pIIa0ERPEeC0spkCnDexvg"/>
@@ -91,7 +91,7 @@
     <fileContextList href="#_pIdK8ERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX3</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pIdK8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pIdK8ERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pIdK8URPEeC0spkCnDexvg" sequenceID="14" userID="Jerry20"/>
     <deltas href="#_pIlt0URPEeC0spkCnDexvg"/>
     <base href="#_pIiqgERPEeC0spkCnDexvg"/>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/ReviewSampl_review.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/ReviewSampl_review.xrer
index 6565ad53..a16f5a16 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/ReviewSampl_review.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/ReviewSampl_review.xrer
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
-<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_o6x7UERPEeC0spkCnDexvg" name="ReviewSampl" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="R4E_REVIEW_TYPE_INFORMAL">
+<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_o6x7UERPEeC0spkCnDexvg" name="ReviewSampl" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" fragmentVersion="0.13.0" type="INFORMAL">
   <reviewTask xsi:type="r4ecore:R4ETaskReference" xmi:id="_pI2zkkRPEeC0spkCnDexvg" taskId="324328" repositoryURL="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324328"/>
-  <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pI2zkURPEeC0spkCnDexvg" state="R4E_REVIEW_PHASE_PREPARATION"/>
+  <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pI2zkURPEeC0spkCnDexvg" state="PREPARATION"/>
   <components>Component1</components>
-  <decision xmi:id="_pI2zkERPEeC0spkCnDexvg" spentTime="120" value="R4E_REVIEW_DECISION_ACCEPTED"/>
+  <decision xmi:id="_pI2zkERPEeC0spkCnDexvg" spentTime="120" value="ACCEPTED"/>
   <createdBy href="Tom10_comments.xrer#_o6yiYkRPEeC0spkCnDexvg"/>
 </r4ecore:R4EReview>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Tom10_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Tom10_comments.xrer
index 2dda2d88..80d76bc9 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Tom10_comments.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Tom10_comments.xrer
@@ -9,13 +9,13 @@
     <addedItems href="Tom10_items.xrer#_pFZ28URPEeC0spkCnDexvg"/>
     <addedItems href="Tom10_items.xrer#_pFsx4URPEeC0spkCnDexvg"/>
     <reviewInstance href="ReviewSampl_review.xrer#_o6x7UERPEeC0spkCnDexvg"/>
-    <roles>R4E_ROLE_ORGANIZER</roles>
-    <roles>R4E_ROLE_LEAD</roles>
+    <roles>ORGANIZER</roles>
+    <roles>LEAD</roles>
     <timeLog xmi:id="_o_li0ERPEeC0spkCnDexvg" key="1867-07-01T00:00:00.000-0500" value="30"/>
     <timeLog xmi:id="_o_li0URPEeC0spkCnDexvg" key="1867-07-03T00:00:00.000-0500" value="30"/>
   </r4ecore:R4EParticipant>
-  <r4ecore:R4EAnomaly xmi:id="_pCpd4ERPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
-    <location xsi:type="r4ecore:R4ETextContent" href="#_pC4HYERPEeC0spkCnDexvg"/>
+  <r4ecore:R4EAnomaly xmi:id="_pCpd4ERPEeC0spkCnDexvg" author="_o6yiYkRPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+    <locations xsi:type="r4ecore:R4ETextContent" href="#_pC4HYERPEeC0spkCnDexvg"/>
     <id xmi:id="_pCshMERPEeC0spkCnDexvg" sequenceID="1" userID="Tom10"/>
   </r4ecore:R4EAnomaly>
   <r4ecore:R4ETextContent xmi:id="_pC4HYERPEeC0spkCnDexvg" info="Write any information here">
@@ -25,11 +25,11 @@
     <file href="#_pDMQcERPEeC0spkCnDexvg"/>
   </r4ecore:R4EAnomalyTextPosition>
   <r4ecore:R4EFileVersion xmi:id="_pDMQcERPEeC0spkCnDexvg" platformURI="platform:/resource/projName/src/dir1/dir2" versionID="8" repositoryPath="/Dir1/Dir2" name="R4ETestFile"/>
-  <r4ecore:R4EComment xmi:id="_pDbhAERPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.928-0500">
+  <r4ecore:R4EComment xmi:id="_pDbhAERPEeC0spkCnDexvg" author="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.928-0500">
     <id xmi:id="_pDbhAURPEeC0spkCnDexvg" sequenceID="2" userID="Tom10"/>
     <anomaly href="Jerry20_comments.xrer#_pDNekERPEeC0spkCnDexvg"/>
   </r4ecore:R4EComment>
-  <r4ecore:R4EComment xmi:id="_pDcvIURPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.930-0500">
+  <r4ecore:R4EComment xmi:id="_pDcvIURPEeC0spkCnDexvg" author="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.930-0500">
     <type xsi:type="r4ecore:R4ECommentType" xmi:id="_pDcvIERPEeC0spkCnDexvg"/>
     <id xmi:id="_pDcvIkRPEeC0spkCnDexvg" sequenceID="3" userID="Tom10"/>
     <anomaly href="Jerry20_comments.xrer#_pDNekERPEeC0spkCnDexvg"/>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Tom10_items.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Tom10_items.xrer
index 40033314..343c28d3 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Tom10_items.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewSampl/Tom10_items.xrer
@@ -7,7 +7,7 @@
     <fileContextList href="#_pEt6cERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX0</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pEt6cERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pEt6cERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pEt6cURPEeC0spkCnDexvg" sequenceID="5" userID="Tom10"/>
     <deltas href="#_pE3EYURPEeC0spkCnDexvg"/>
     <base href="#_pEuhgERPEeC0spkCnDexvg"/>
@@ -35,7 +35,7 @@
     <fileContextList href="#_pFIKIERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX1</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pFIKIERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pFIKIERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pFIKIURPEeC0spkCnDexvg" sequenceID="8" userID="Tom10"/>
     <deltas href="#_pFL0gURPEeC0spkCnDexvg"/>
     <base href="#_pFJ_UERPEeC0spkCnDexvg"/>
@@ -63,7 +63,7 @@
     <fileContextList href="#_pFbsIERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX2</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pFbsIERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pFbsIERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pFbsIURPEeC0spkCnDexvg" sequenceID="11" userID="Tom10"/>
     <deltas href="#_pFhLsURPEeC0spkCnDexvg"/>
     <base href="#_pFfWgERPEeC0spkCnDexvg"/>
@@ -91,7 +91,7 @@
     <fileContextList href="#_pFv1MERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX3</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pFv1MERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pFv1MERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pFv1MURPEeC0spkCnDexvg" sequenceID="14" userID="Tom10"/>
     <deltas href="#_pF1UwURPEeC0spkCnDexvg"/>
     <base href="#_pFxDUERPEeC0spkCnDexvg"/>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Jerry20_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Jerry20_comments.xrer
index 5cb11de3..523d079d 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Jerry20_comments.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Jerry20_comments.xrer
@@ -9,12 +9,12 @@
     <addedItems href="Jerry20_items.xrer#_pQXw0URPEeC0spkCnDexvg"/>
     <addedItems href="Jerry20_items.xrer#_pQhh0URPEeC0spkCnDexvg"/>
     <reviewInstance href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
-    <roles>R4E_ROLE_LEAD</roles>
+    <roles>LEAD</roles>
     <timeLog xmi:id="_pM60MERPEeC0spkCnDexvg" key="1867-07-01T00:00:00.000-0500" value="30"/>
     <timeLog xmi:id="_pM60MURPEeC0spkCnDexvg" key="1867-07-03T00:00:00.000-0500" value="30"/>
   </r4ecore:R4EParticipant>
-  <r4ecore:R4EAnomaly xmi:id="_pNATwERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
-    <location xsi:type="r4ecore:R4ETextContent" href="#_pNA60ERPEeC0spkCnDexvg"/>
+  <r4ecore:R4EAnomaly xmi:id="_pNATwERPEeC0spkCnDexvg" author="_pLWG40RPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+    <locations xsi:type="r4ecore:R4ETextContent" href="#_pNA60ERPEeC0spkCnDexvg"/>
     <id xmi:id="_pNATwURPEeC0spkCnDexvg" sequenceID="1" userID="Jerry20"/>
   </r4ecore:R4EAnomaly>
   <r4ecore:R4ETextContent xmi:id="_pNA60ERPEeC0spkCnDexvg" info="Write any information here">
@@ -24,11 +24,11 @@
     <file href="#_pNBh4URPEeC0spkCnDexvg"/>
   </r4ecore:R4EAnomalyTextPosition>
   <r4ecore:R4EFileVersion xmi:id="_pNBh4URPEeC0spkCnDexvg" platformURI="platform:/resource/projName/src/dir1/dir2" versionID="8" repositoryPath="/Dir1/Dir2" name="R4ETestFile"/>
-  <r4ecore:R4EComment xmi:id="_pNDXEERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.937-0500">
+  <r4ecore:R4EComment xmi:id="_pNDXEERPEeC0spkCnDexvg" author="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.937-0500">
     <id xmi:id="_pNDXEURPEeC0spkCnDexvg" sequenceID="2" userID="Jerry20"/>
     <anomaly href="Tom10_comments.xrer#_pM7bQERPEeC0spkCnDexvg"/>
   </r4ecore:R4EComment>
-  <r4ecore:R4EComment xmi:id="_pNGaYERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.942-0500">
+  <r4ecore:R4EComment xmi:id="_pNGaYERPEeC0spkCnDexvg" author="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.942-0500">
     <type xsi:type="r4ecore:R4ECommentType" xmi:id="_pNElMERPEeC0spkCnDexvg"/>
     <id xmi:id="_pNGaYURPEeC0spkCnDexvg" sequenceID="3" userID="Jerry20"/>
     <anomaly href="Tom10_comments.xrer#_pM7bQERPEeC0spkCnDexvg"/>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Jerry20_items.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Jerry20_items.xrer
index 1a63c1b4..d8c97a8c 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Jerry20_items.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Jerry20_items.xrer
@@ -7,7 +7,7 @@
     <fileContextList href="#_pQNYwERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX0</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pQNYwERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pQNYwERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pQNYwURPEeC0spkCnDexvg" sequenceID="5" userID="Jerry20"/>
     <deltas href="#_pQOm4URPEeC0spkCnDexvg"/>
     <base href="#_pQN_0ERPEeC0spkCnDexvg"/>
@@ -35,7 +35,7 @@
     <fileContextList href="#_pQS4UERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX1</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pQS4UERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pQS4UERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pQS4UURPEeC0spkCnDexvg" sequenceID="8" userID="Jerry20"/>
     <deltas href="#_pQUtgERPEeC0spkCnDexvg"/>
     <base href="#_pQTfYERPEeC0spkCnDexvg"/>
@@ -63,7 +63,7 @@
     <fileContextList href="#_pQY-8ERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX2</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pQY-8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pQY-8ERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pQY-8URPEeC0spkCnDexvg" sequenceID="11" userID="Jerry20"/>
     <deltas href="#_pQaNEkRPEeC0spkCnDexvg"/>
     <base href="#_pQZmAERPEeC0spkCnDexvg"/>
@@ -91,7 +91,7 @@
     <fileContextList href="#_pQiv8ERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX3</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pQiv8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pQiv8ERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pQiv8URPEeC0spkCnDexvg" sequenceID="14" userID="Jerry20"/>
     <deltas href="#_pQklIERPEeC0spkCnDexvg"/>
     <base href="#_pQjXAERPEeC0spkCnDexvg"/>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/ReviewTwo_review.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/ReviewTwo_review.xrer
index 174f42f8..67f5762a 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/ReviewTwo_review.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/ReviewTwo_review.xrer
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
-<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_pI3aoERPEeC0spkCnDexvg" name="ReviewTwo" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="R4E_REVIEW_TYPE_INFORMAL">
+<r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_pI3aoERPEeC0spkCnDexvg" name="ReviewTwo" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" fragmentVersion="0.13.0" endDate="1867-07-03T00:00:00.000-0500" type="INFORMAL">
   <reviewTask xsi:type="r4ecore:R4ETaskReference" xmi:id="_pQo2kkRPEeC0spkCnDexvg" taskId="324328" repositoryURL="https://bugs.eclipse.org/bugs/show_bug.cgi?id=324328"/>
-  <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pQo2kURPEeC0spkCnDexvg" state="R4E_REVIEW_PHASE_PREPARATION"/>
+  <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pQo2kURPEeC0spkCnDexvg" state="PREPARATION"/>
   <components>Component1</components>
-  <decision xmi:id="_pQo2kERPEeC0spkCnDexvg" spentTime="120" value="R4E_REVIEW_DECISION_ACCEPTED"/>
+  <decision xmi:id="_pQo2kERPEeC0spkCnDexvg" spentTime="120" value="ACCEPTED"/>
   <createdBy href="Tom10_comments.xrer#_pI3ao0RPEeC0spkCnDexvg"/>
 </r4ecore:R4EReview>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Tom10_comments.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Tom10_comments.xrer
index 3e166c74..91278af4 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Tom10_comments.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Tom10_comments.xrer
@@ -9,13 +9,13 @@
     <addedItems href="Tom10_items.xrer#_pOUiYURPEeC0spkCnDexvg"/>
     <addedItems href="Tom10_items.xrer#_pObQEURPEeC0spkCnDexvg"/>
     <reviewInstance href="ReviewTwo_review.xrer#_pI3aoERPEeC0spkCnDexvg"/>
-    <roles>R4E_ROLE_ORGANIZER</roles>
-    <roles>R4E_ROLE_LEAD</roles>
+    <roles>ORGANIZER</roles>
+    <roles>LEAD</roles>
     <timeLog xmi:id="_pLWG4ERPEeC0spkCnDexvg" key="1867-07-01T00:00:00.000-0500" value="30"/>
     <timeLog xmi:id="_pLWG4URPEeC0spkCnDexvg" key="1867-07-03T00:00:00.000-0500" value="30"/>
   </r4ecore:R4EParticipant>
-  <r4ecore:R4EAnomaly xmi:id="_pM7bQERPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
-    <location xsi:type="r4ecore:R4ETextContent" href="#_pM93gERPEeC0spkCnDexvg"/>
+  <r4ecore:R4EAnomaly xmi:id="_pM7bQERPEeC0spkCnDexvg" author="_pI3ao0RPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+    <locations xsi:type="r4ecore:R4ETextContent" href="#_pM93gERPEeC0spkCnDexvg"/>
     <id xmi:id="_pM7bQURPEeC0spkCnDexvg" sequenceID="1" userID="Tom10"/>
   </r4ecore:R4EAnomaly>
   <r4ecore:R4ETextContent xmi:id="_pM93gERPEeC0spkCnDexvg" info="Write any information here">
@@ -25,11 +25,11 @@
     <file href="#_pM_ssERPEeC0spkCnDexvg"/>
   </r4ecore:R4EAnomalyTextPosition>
   <r4ecore:R4EFileVersion xmi:id="_pM_ssERPEeC0spkCnDexvg" platformURI="platform:/resource/projName/src/dir1/dir2" versionID="8" repositoryPath="/Dir1/Dir2" name="R4ETestFile"/>
-  <r4ecore:R4EComment xmi:id="_pNCI8ERPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.935-0500">
+  <r4ecore:R4EComment xmi:id="_pNCI8ERPEeC0spkCnDexvg" author="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.935-0500">
     <id xmi:id="_pNCI8URPEeC0spkCnDexvg" sequenceID="2" userID="Tom10"/>
     <anomaly href="Jerry20_comments.xrer#_pNATwERPEeC0spkCnDexvg"/>
   </r4ecore:R4EComment>
-  <r4ecore:R4EComment xmi:id="_pNCwAURPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.936-0500">
+  <r4ecore:R4EComment xmi:id="_pNCwAURPEeC0spkCnDexvg" author="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.936-0500">
     <type xsi:type="r4ecore:R4ECommentType" xmi:id="_pNCwAERPEeC0spkCnDexvg"/>
     <id xmi:id="_pNCwAkRPEeC0spkCnDexvg" sequenceID="3" userID="Tom10"/>
     <anomaly href="Jerry20_comments.xrer#_pNATwERPEeC0spkCnDexvg"/>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Tom10_items.xrer b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Tom10_items.xrer
index b6550537..f106a480 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Tom10_items.xrer
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/ReviewTwo/Tom10_items.xrer
@@ -7,7 +7,7 @@
     <fileContextList href="#_pOLYcERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX0</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pOLYcERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pOLYcERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pOLYcURPEeC0spkCnDexvg" sequenceID="5" userID="Tom10"/>
     <deltas href="#_pOMmkURPEeC0spkCnDexvg"/>
     <base href="#_pOL_gERPEeC0spkCnDexvg"/>
@@ -35,7 +35,7 @@
     <fileContextList href="#_pOPC0ERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX1</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pOPC0ERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pOPC0ERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pOPC0URPEeC0spkCnDexvg" sequenceID="8" userID="Tom10"/>
     <deltas href="#_pOQQ8kRPEeC0spkCnDexvg"/>
     <base href="#_pOPp4ERPEeC0spkCnDexvg"/>
@@ -63,7 +63,7 @@
     <fileContextList href="#_pOVwgERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX2</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pOVwgERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pOVwgERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pOVwgURPEeC0spkCnDexvg" sequenceID="11" userID="Tom10"/>
     <deltas href="#_pOXlsERPEeC0spkCnDexvg"/>
     <base href="#_pOWXkERPEeC0spkCnDexvg"/>
@@ -91,7 +91,7 @@
     <fileContextList href="#_pOceMERPEeC0spkCnDexvg"/>
     <ProjectURIs>platform:resource/projX3</ProjectURIs>
   </r4ecore:R4EItem>
-  <r4ecore:R4EFileContext xmi:id="_pOceMERPEeC0spkCnDexvg" type="R4E_ADDED">
+  <r4ecore:R4EFileContext xmi:id="_pOceMERPEeC0spkCnDexvg" type="ADDED">
     <id xmi:id="_pOceMURPEeC0spkCnDexvg" sequenceID="14" userID="Tom10"/>
     <deltas href="#_pOlBEURPEeC0spkCnDexvg"/>
     <base href="#_pOeTYERPEeC0spkCnDexvg"/>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/conversion.log b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/conversion.log
new file mode 100644
index 00000000..740f9d8f
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/stubs_model/outGroupX/conversion.log
@@ -0,0 +1,110 @@
+R4E Common Model Conversion Log: /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/conversion.log
+
+
+Root Folder: /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/Golden_Group_group_root.xrer
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/Jerry20_group_reviews.xrer
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/lmcalvs_group_reviews.xrer
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/Review1/lmcalvs_comments.xrer
+          3:    <roles>R4E_ROLE_ORGANIZER</roles>
+                <roles>ORGANIZER</roles>
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/Review1/Review1_review.xrer
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewSampl/Jerry20_comments.xrer
+         11:      <roles>R4E_ROLE_LEAD</roles>
+                  <roles>LEAD</roles>
+         15:    <r4ecore:R4EAnomaly xmi:id="_pDNekERPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+                <r4ecore:R4EAnomaly xmi:id="_pDNekERPEeC0spkCnDexvg" author="_o_mw8URPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+         16:      <location xsi:type="r4ecore:R4ETextContent" href="#_pDOssERPEeC0spkCnDexvg"/>
+                  <locations xsi:type="r4ecore:R4ETextContent" href="#_pDOssERPEeC0spkCnDexvg"/>
+         26:    <r4ecore:R4EComment xmi:id="_pDekUERPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.933-0500">
+                <r4ecore:R4EComment xmi:id="_pDekUERPEeC0spkCnDexvg" author="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.933-0500">
+         30:    <r4ecore:R4EComment xmi:id="_pDgZgURPEeC0spkCnDexvg" user="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.936-0500">
+                <r4ecore:R4EComment xmi:id="_pDgZgURPEeC0spkCnDexvg" author="_o_mw8URPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.936-0500">
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewSampl/Jerry20_items.xrer
+          9:    <r4ecore:R4EFileContext xmi:id="_pH0RwERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pH0RwERPEeC0spkCnDexvg" type="ADDED">
+         37:    <r4ecore:R4EFileContext xmi:id="_pH-CwERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pH-CwERPEeC0spkCnDexvg" type="ADDED">
+         65:    <r4ecore:R4EFileContext xmi:id="_pIHzwERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pIHzwERPEeC0spkCnDexvg" type="ADDED">
+         93:    <r4ecore:R4EFileContext xmi:id="_pIdK8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pIdK8ERPEeC0spkCnDexvg" type="ADDED">
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewSampl/ReviewSampl_review.xrer
+          1:  <r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_o6x7UERPEeC0spkCnDexvg" name="ReviewSampl" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="R4E_REVIEW_TYPE_INFORMAL">
+              <r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_o6x7UERPEeC0spkCnDexvg" name="ReviewSampl" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="INFORMAL">
+          3:    <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pI2zkURPEeC0spkCnDexvg" state="R4E_REVIEW_PHASE_PREPARATION"/>
+                <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pI2zkURPEeC0spkCnDexvg" state="PREPARATION"/>
+          5:    <decision xmi:id="_pI2zkERPEeC0spkCnDexvg" spentTime="120" value="R4E_REVIEW_DECISION_ACCEPTED"/>
+                <decision xmi:id="_pI2zkERPEeC0spkCnDexvg" spentTime="120" value="ACCEPTED"/>
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewSampl/Tom10_comments.xrer
+         11:      <roles>R4E_ROLE_ORGANIZER</roles>
+                  <roles>ORGANIZER</roles>
+         12:      <roles>R4E_ROLE_LEAD</roles>
+                  <roles>LEAD</roles>
+         16:    <r4ecore:R4EAnomaly xmi:id="_pCpd4ERPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+                <r4ecore:R4EAnomaly xmi:id="_pCpd4ERPEeC0spkCnDexvg" author="_o6yiYkRPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+         17:      <location xsi:type="r4ecore:R4ETextContent" href="#_pC4HYERPEeC0spkCnDexvg"/>
+                  <locations xsi:type="r4ecore:R4ETextContent" href="#_pC4HYERPEeC0spkCnDexvg"/>
+         27:    <r4ecore:R4EComment xmi:id="_pDbhAERPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.928-0500">
+                <r4ecore:R4EComment xmi:id="_pDbhAERPEeC0spkCnDexvg" author="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:46.928-0500">
+         31:    <r4ecore:R4EComment xmi:id="_pDcvIURPEeC0spkCnDexvg" user="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.930-0500">
+                <r4ecore:R4EComment xmi:id="_pDcvIURPEeC0spkCnDexvg" author="_o6yiYkRPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:46.930-0500">
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewSampl/Tom10_items.xrer
+          9:    <r4ecore:R4EFileContext xmi:id="_pEt6cERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pEt6cERPEeC0spkCnDexvg" type="ADDED">
+         37:    <r4ecore:R4EFileContext xmi:id="_pFIKIERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pFIKIERPEeC0spkCnDexvg" type="ADDED">
+         65:    <r4ecore:R4EFileContext xmi:id="_pFbsIERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pFbsIERPEeC0spkCnDexvg" type="ADDED">
+         93:    <r4ecore:R4EFileContext xmi:id="_pFv1MERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pFv1MERPEeC0spkCnDexvg" type="ADDED">
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewTwo/Jerry20_comments.xrer
+         11:      <roles>R4E_ROLE_LEAD</roles>
+                  <roles>LEAD</roles>
+         15:    <r4ecore:R4EAnomaly xmi:id="_pNATwERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+                <r4ecore:R4EAnomaly xmi:id="_pNATwERPEeC0spkCnDexvg" author="_pLWG40RPEeC0spkCnDexvg" description="Jerry20- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+         16:      <location xsi:type="r4ecore:R4ETextContent" href="#_pNA60ERPEeC0spkCnDexvg"/>
+                  <locations xsi:type="r4ecore:R4ETextContent" href="#_pNA60ERPEeC0spkCnDexvg"/>
+         26:    <r4ecore:R4EComment xmi:id="_pNDXEERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.937-0500">
+                <r4ecore:R4EComment xmi:id="_pNDXEERPEeC0spkCnDexvg" author="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.937-0500">
+         30:    <r4ecore:R4EComment xmi:id="_pNGaYERPEeC0spkCnDexvg" user="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.942-0500">
+                <r4ecore:R4EComment xmi:id="_pNGaYERPEeC0spkCnDexvg" author="_pLWG40RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.942-0500">
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewTwo/Jerry20_items.xrer
+          9:    <r4ecore:R4EFileContext xmi:id="_pQNYwERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pQNYwERPEeC0spkCnDexvg" type="ADDED">
+         37:    <r4ecore:R4EFileContext xmi:id="_pQS4UERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pQS4UERPEeC0spkCnDexvg" type="ADDED">
+         65:    <r4ecore:R4EFileContext xmi:id="_pQY-8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pQY-8ERPEeC0spkCnDexvg" type="ADDED">
+         93:    <r4ecore:R4EFileContext xmi:id="_pQiv8ERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pQiv8ERPEeC0spkCnDexvg" type="ADDED">
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewTwo/ReviewTwo_review.xrer
+          1:  <r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_pI3aoERPEeC0spkCnDexvg" name="ReviewTwo" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="R4E_REVIEW_TYPE_INFORMAL">
+              <r4ecore:R4EReview xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:r4ecore="http://org.eclipse.mylyn.reviews.r4e.core.model/" xmi:id="_pI3aoERPEeC0spkCnDexvg" name="ReviewTwo" project="P1" entryCriteria="Sample Entry Cryteria" extraNotes="Sample extra notes" objectives="Sample Objectives" referenceMaterial="sample reference material" startDate="1867-07-01T00:00:00.000-0500" endDate="1867-07-03T00:00:00.000-0500" type="INFORMAL">
+          3:    <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pQo2kURPEeC0spkCnDexvg" state="R4E_REVIEW_PHASE_PREPARATION"/>
+                <state xsi:type="r4ecore:R4EReviewState" xmi:id="_pQo2kURPEeC0spkCnDexvg" state="PREPARATION"/>
+          5:    <decision xmi:id="_pQo2kERPEeC0spkCnDexvg" spentTime="120" value="R4E_REVIEW_DECISION_ACCEPTED"/>
+                <decision xmi:id="_pQo2kERPEeC0spkCnDexvg" spentTime="120" value="ACCEPTED"/>
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewTwo/Tom10_comments.xrer
+         11:      <roles>R4E_ROLE_ORGANIZER</roles>
+                  <roles>ORGANIZER</roles>
+         12:      <roles>R4E_ROLE_LEAD</roles>
+                  <roles>LEAD</roles>
+         16:    <r4ecore:R4EAnomaly xmi:id="_pM7bQERPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+                <r4ecore:R4EAnomaly xmi:id="_pM7bQERPEeC0spkCnDexvg" author="_pI3ao0RPEeC0spkCnDexvg" description="Tom10- Anomaly text here ....." title="This is sample Title - Anomaly" createdOn="1867-07-11T00:00:00.000-0500">
+         17:      <location xsi:type="r4ecore:R4ETextContent" href="#_pM93gERPEeC0spkCnDexvg"/>
+                  <locations xsi:type="r4ecore:R4ETextContent" href="#_pM93gERPEeC0spkCnDexvg"/>
+         27:    <r4ecore:R4EComment xmi:id="_pNCI8ERPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.935-0500">
+                <r4ecore:R4EComment xmi:id="_pNCI8ERPEeC0spkCnDexvg" author="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 1" createdOn="2011-03-01T17:02:47.935-0500">
+         31:    <r4ecore:R4EComment xmi:id="_pNCwAURPEeC0spkCnDexvg" user="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.936-0500">
+                <r4ecore:R4EComment xmi:id="_pNCwAURPEeC0spkCnDexvg" author="_pI3ao0RPEeC0spkCnDexvg" description="This is test comment number 2" createdOn="2011-03-01T17:02:47.936-0500">
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/ReviewTwo/Tom10_items.xrer
+          9:    <r4ecore:R4EFileContext xmi:id="_pOLYcERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pOLYcERPEeC0spkCnDexvg" type="ADDED">
+         37:    <r4ecore:R4EFileContext xmi:id="_pOPC0ERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pOPC0ERPEeC0spkCnDexvg" type="ADDED">
+         65:    <r4ecore:R4EFileContext xmi:id="_pOVwgERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pOVwgERPEeC0spkCnDexvg" type="ADDED">
+         93:    <r4ecore:R4EFileContext xmi:id="_pOceMERPEeC0spkCnDexvg" type="R4E_ADDED">
+                <r4ecore:R4EFileContext xmi:id="_pOceMERPEeC0spkCnDexvg" type="ADDED">
+    /var/folders/cg/sxbk4f855q13n6qn9q0r9w440000gn/T/r4eTst/1351808835022/OutL1/OutL2/outGroupX/Tom10_group_reviews.xrer
diff --git a/org.eclipse.mylyn.reviews.r4e.core/.classpath b/org.eclipse.mylyn.reviews.r4e.core/.classpath
index 304e8618..6ac56c3d 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/.classpath
+++ b/org.eclipse.mylyn.reviews.r4e.core/.classpath
@@ -2,6 +2,11 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/mylyn/reviews/core/model/**"/>
+			<accessrule kind="accessible" pattern="org/eclipse/mylyn/reviews/internal/core/model/**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.mylyn.reviews.r4e.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.mylyn.reviews.r4e.core/.settings/org.eclipse.core.resources.prefs
index 14d87023..0cd28829 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.mylyn.reviews.r4e.core/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,3 @@
-#Thu Oct 28 18:22:21 EDT 2010
 eclipse.preferences.version=1
-encoding//model/org.eclipse.mylyn.reviews.r4e.core.model.ecore=UTF-8
-encoding//model/org.eclipse.mylyn.reviews.r4e.core.model.ecorediag=UTF-8
-encoding//model/r4e.design.rules.ecorediag=UTF-8
+encoding//model/drules.ecorediag=UTF-8
+encoding//model/r4e.ecorediag=UTF-8
diff --git a/org.eclipse.mylyn.reviews.r4e.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.core/META-INF/MANIFEST.MF
index acacd372..812d5d87 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.core/META-INF/MANIFEST.MF
@@ -7,28 +7,30 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: 
- org.eclipse.mylyn.reviews.r4e.core;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.model;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.model.drules;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.model.drules.util;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.model.impl;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.model.serial;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.model.serial.impl;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.model.util;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.rfs;x-friends:="org.eclipse.mylyn.reviews.r4e.core.tests",
- org.eclipse.mylyn.reviews.r4e.core.rfs.spi;x-friends:="org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.utils;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.utils.cmd;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.utils.filePermission;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui",
- org.eclipse.mylyn.reviews.r4e.core.utils.sys;x-friends:="org.eclipse.mylyn.reviews.r4e.core,org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.ui"
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.mylyn.reviews.frame.core;bundle-version="0.10.0",
+ org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.jgit;bundle-version="0.9.1",
  org.eclipse.egit.core;bundle-version="0.9.1",
  org.eclipse.team.core;bundle-version="3.5.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.5.0"
+ org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
+ org.eclipse.mylyn.reviews.r4e.core;visibility:=reexport,
+ org.eclipse.mylyn.reviews.core;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.mylyn.reviews.r4e.core.Activator
+Import-Package: org.apache.commons.lang
+Export-Package: org.eclipse.mylyn.reviews.r4e.core;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.model;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.model.drules;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.model.drules.util;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.model.impl;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.model.serial;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.model.serial.impl;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.model.util;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.rfs;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.rfs.spi;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.utils;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.utils.cmd;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.utils.filePermission;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui",
+ org.eclipse.mylyn.reviews.r4e.core.utils.sys;x-friends:="org.eclipse.mylyn.reviews.r4e.core,  org.eclipse.mylyn.reviews.r4e.core.tests,  org.eclipse.mylyn.reviews.r4e.ui,  org.eclipse.mylyn.reviews.r4e.connector,  org.eclipse.mylyn.reviews.r4e.connector.tests,  org.eclipse.mylyn.reviews.r4e.connector.ui"
diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.design.rules.ecore b/org.eclipse.mylyn.reviews.r4e.core/model/drules.ecore
index d2b99ae2..5a6b52a0 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.design.rules.ecore
+++ b/org.eclipse.mylyn.reviews.r4e.core/model/drules.ecore
@@ -1,45 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="drules"

-    nsURI="http://org.eclipse.mylyn.reviews.r4e.core.model.drules.ecore/1.0" nsPrefix="org.eclipse.mylyn.reviews.r4e.core.model.drules.ecore">

-  <eClassifiers xsi:type="ecore:EClass" name="R4EDesignRuleCollection" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent ../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//SubModelRoot">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="areas" upperBound="-1"

-        eType="#//R4EDesignRuleArea" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="folder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-        transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="R4EDesignRule" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rank" eType="#//R4EDesignRuleRank"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" eType="#//R4EDesignRuleClass"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="R4EDesignRuleArea" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="violations" upperBound="-1"

-        eType="#//R4EDesignRuleViolation" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="R4EDesignRuleViolation" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"

-        eType="#//R4EDesignRule" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="R4EDesignRuleRank">

-    <eLiterals name="R4E_RANK_NONE"/>

-    <eLiterals name="R4E_RANK_MINOR" value="1" literal="R4E_RANK_MINOR"/>

-    <eLiterals name="R4E_RANK_MAJOR" value="2"/>

-    <eLiterals name="R4E_RANK_DEPRECATED" value="3" literal=""/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="R4EDesignRuleClass">

-    <eLiterals name="R4E_CLASS_ERRONEOUS"/>

-    <eLiterals name="R4E_CLASS_SUPERFLUOUS" value="1" literal="R4E_CLASS_SUPERFLUOUS"/>

-    <eLiterals name="R4E_CLASS_IMPROVEMENT" value="2"/>

-    <eLiterals name="R4E_CLASS_QUESTION" value="3"/>

-    <eLiterals name="R4E_CLASS_COMMENT" value="4"/>

-    <eLiterals name="R4E_CLASS_MISSING" value="5"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="drules" nsURI="http://org.eclipse.mylyn.reviews.r4e.core.model.drules.ecore/1.0"
+    nsPrefix="org.eclipse.mylyn.reviews.r4e.core.model.drules.ecore">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EDesignRuleCollection" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ReviewComponent platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ModelVersioning">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="areas" upperBound="-1"
+        eType="#//R4EDesignRuleArea" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="folder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        transient="true" derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="R4EDesignRule" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ReviewComponent">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rank" eType="#//R4EDesignRuleRank"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="class" eType="#//R4EDesignRuleClass"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="R4EDesignRuleArea" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ReviewComponent">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="violations" upperBound="-1"
+        eType="#//R4EDesignRuleViolation" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="R4EDesignRuleViolation" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ReviewComponent">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"
+        eType="#//R4EDesignRule" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="R4EDesignRuleRank">
+    <eLiterals name="None" literal="NONE"/>
+    <eLiterals name="Minor" value="1" literal="MINOR"/>
+    <eLiterals name="Major" value="2" literal="MAJOR"/>
+    <eLiterals name="Deprecated" value="3" literal="DEPRECATED"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="R4EDesignRuleClass">
+    <eLiterals name="Erroneous" literal="ERRONEOUS"/>
+    <eLiterals name="Superfluous" value="1" literal="SUPERFLUOUS"/>
+    <eLiterals name="Improvement" value="2" literal="IMPROVEMENT"/>
+    <eLiterals name="Question" value="3" literal="QUESTION"/>
+    <eLiterals name="Comment" value="4" literal="COMMENT"/>
+    <eLiterals name="Missing" value="5" literal="MISSING"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/drules.ecorediag b/org.eclipse.mylyn.reviews.r4e.core/model/drules.ecorediag
new file mode 100644
index 00000000..c576ed61
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/model/drules.ecorediag
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_cC8B0DsfEeK9hu0ISTvKPQ" type="EcoreTools" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_cDBhYDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_cDCIcDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_cDCIcTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_cDEksDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRuleCollection/version"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDEksTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDFLwDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRuleCollection/folder"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDFLwTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDFLwjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRuleCollection/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDFLwzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDCIcjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDCIczsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDCIdDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_cDCIdTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDCIdjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDCvgDsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDCvgTsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_cDBhYTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="drules.ecore#//R4EDesignRuleCollection"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cDBhYjsfEeK9hu0ISTvKPQ" x="10" y="407"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_cDFLxDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_cDFy0DsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_cDFy0TsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_cDFy2TsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRule/id"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDFy2jsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDGZ4DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRule/rank"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDGZ4TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDGZ4jsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRule/class"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDGZ4zsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDGZ5DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRule/title"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDGZ5TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDGZ5jsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRule/description"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDHA8DsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDFy0jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDFy0zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDFy1DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_cDFy1TsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDFy1jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDFy1zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDFy2DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_cDFLxTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="drules.ecore#//R4EDesignRule"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cDFLxjsfEeK9hu0ISTvKPQ"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_cDHA8TsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_cDHA9DsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_cDHA9TsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_cDHoBDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRuleArea/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDHoBTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDHA9jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDHA9zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDHA-DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_cDHoADsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDHoATsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDHoAjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDHoAzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_cDHA8jsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="drules.ecore#//R4EDesignRuleArea"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cDHA8zsfEeK9hu0ISTvKPQ" x="23" y="298"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_cDHoBjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_cDIPEDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_cDIPETsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_cDIPGTsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="drules.ecore#//R4EDesignRuleViolation/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDIPGjsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDIPEjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDIPEzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDIPFDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_cDIPFTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDIPFjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDIPFzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDIPGDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_cDHoBzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="drules.ecore#//R4EDesignRuleViolation"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cDHoCDsfEeK9hu0ISTvKPQ" x="13" y="189"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_cDI2IDsfEeK9hu0ISTvKPQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_cDI2IzsfEeK9hu0ISTvKPQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_cDI2JDsfEeK9hu0ISTvKPQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_cDJdMDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleRank/None"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDJdMTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDJdMjsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleRank/Minor"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDJdMzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDJdNDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleRank/Major"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDJdNTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDJdNjsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleRank/Deprecated"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDJdNzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDI2JTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDI2JjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDI2JzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_cDI2ITsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="drules.ecore#//R4EDesignRuleRank"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cDI2IjsfEeK9hu0ISTvKPQ" x="223"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_cDKEQDsfEeK9hu0ISTvKPQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_cDKEQzsfEeK9hu0ISTvKPQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_cDKERDsfEeK9hu0ISTvKPQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_cDKrUDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleClass/Erroneous"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDKrUTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDKrUjsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleClass/Superfluous"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDKrUzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDKrVDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleClass/Improvement"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDKrVTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDLSYDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleClass/Question"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDLSYTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDLSYjsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleClass/Comment"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDLSYzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cDLSZDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="drules.ecore#//R4EDesignRuleClass/Missing"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cDLSZTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_cDKERTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cDKERjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cDKERzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_cDKEQTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="drules.ecore#//R4EDesignRuleClass"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cDKEQjsfEeK9hu0ISTvKPQ" x="401"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_cC8B0TsfEeK9hu0ISTvKPQ"/>
+  <element xmi:type="ecore:EPackage" href="drules.ecore#/"/>
+  <edges xmi:type="notation:Edge" xmi:id="_cDLSZjsfEeK9hu0ISTvKPQ" type="3002" source="_cDBhYDsfEeK9hu0ISTvKPQ" target="_cDHA8TsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_cDL5cDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_cDL5cTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_cDL5cjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_cDL5czsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_cDLSZzsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_cDLSaDsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="drules.ecore#//R4EDesignRuleCollection/areas"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cDLSaTsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cF09wDsfEeK9hu0ISTvKPQ" id="(0.4965034965034965,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cF09wTsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_cDNHkDsfEeK9hu0ISTvKPQ" type="3002" source="_cDHA8TsfEeK9hu0ISTvKPQ" target="_cDHoBjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_cDNHlDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_cDNHlTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_cDNHljsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_cDNHlzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_cDNHkTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_cDNHkjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="drules.ecore#//R4EDesignRuleArea/violations"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cDNHkzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cFzvoDsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cFzvoTsfEeK9hu0ISTvKPQ" id="(0.49635036496350365,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_cDNHmDsfEeK9hu0ISTvKPQ" type="3002" source="_cDHoBjsfEeK9hu0ISTvKPQ" target="_cDFLxDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_cDNuozsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_cDNupDsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_cDNupTsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_cDNupjsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_cDNuoDsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_cDNuoTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="drules.ecore#//R4EDesignRuleViolation/rules"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cDNuojsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 76]$[0, -76, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cF0WsDsfEeK9hu0ISTvKPQ" id="(0.49635036496350365,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cF0WsTsfEeK9hu0ISTvKPQ" id="(0.49693251533742333,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/drules.genmodel b/org.eclipse.mylyn.reviews.r4e.core/model/drules.genmodel
new file mode 100644
index 00000000..4e3bd2fd
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/model/drules.genmodel
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2012 Ericsson&#xA;&#xA;All rights reserved. This program and the accompanying materials are&#xA;made available under the terms of the Eclipse Public License v1.0 which&#xA;accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Description:&#xA;&#xA;Contributors:&#xA;Alvaro Sanchez-Leon  - Initial API and implementation&#xA;"
+    modelDirectory="/org.eclipse.mylyn.reviews.r4e.core/src" modelPluginID="org.eclipse.mylyn.reviews.r4e.core"
+    modelName="R4e" suppressEMFTypes="true" importerID="org.eclipse.emf.importer.ecore"
+    containmentProxies="true" complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.7"
+    usedGenPackages="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.genmodel#//reviews">
+  <foreignModel>drules.ecore</foreignModel>
+  <genPackages prefix="DRModel" basePackage="org.eclipse.mylyn.reviews.r4e.core.model"
+      resource="XML" disposableProviderFactory="true" fileExtensions="drules" ecorePackage="drules.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="drules.ecore#//R4EDesignRuleRank">
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleRank/None"/>
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleRank/Minor"/>
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleRank/Major"/>
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleRank/Deprecated"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="drules.ecore#//R4EDesignRuleClass">
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleClass/Erroneous"/>
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleClass/Superfluous"/>
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleClass/Improvement"/>
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleClass/Question"/>
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleClass/Comment"/>
+      <genEnumLiterals ecoreEnumLiteral="drules.ecore#//R4EDesignRuleClass/Missing"/>
+    </genEnums>
+    <genClasses ecoreClass="drules.ecore#//R4EDesignRuleCollection">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference drules.ecore#//R4EDesignRuleCollection/areas"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRuleCollection/version"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRuleCollection/folder"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRuleCollection/name"/>
+    </genClasses>
+    <genClasses ecoreClass="drules.ecore#//R4EDesignRule">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRule/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRule/rank"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRule/class"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRule/title"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRule/description"/>
+    </genClasses>
+    <genClasses ecoreClass="drules.ecore#//R4EDesignRuleArea">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference drules.ecore#//R4EDesignRuleArea/violations"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRuleArea/name"/>
+    </genClasses>
+    <genClasses ecoreClass="drules.ecore#//R4EDesignRuleViolation">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference drules.ecore#//R4EDesignRuleViolation/rules"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute drules.ecore#//R4EDesignRuleViolation/name"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/org.eclipse.mylyn.reviews.r4e.core.model.ecorediag b/org.eclipse.mylyn.reviews.r4e.core/model/org.eclipse.mylyn.reviews.r4e.core.model.ecorediag
deleted file mode 100644
index aa5be9ab..00000000
--- a/org.eclipse.mylyn.reviews.r4e.core/model/org.eclipse.mylyn.reviews.r4e.core.model.ecorediag
+++ /dev/null
@@ -1,1728 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_e47JALX-Ed-Xj-3H8XK7WQ" type="EcoreTools" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_e5Wm0LX-Ed-Xj-3H8XK7WQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e5XN4LX-Ed-Xj-3H8XK7WQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e5XN4bX-Ed-Xj-3H8XK7WQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_e5ctcLX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5ctcbX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_upYXsP2UEd-cPPwmp0u5Rg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/folder"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_upYXsf2UEd-cPPwmp0u5Rg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5ctcrX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/defaultEntryCriteria"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5ctc7X-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5ctdLX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/availableProjects"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5ctdbX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5dUgLX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/availableComponents"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5dUgbX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5hl-bX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/designRuleLocations"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5hl-rX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5XN4rX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5XN47X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5XN5LX-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e5X08LX-Ed-Xj-3H8XK7WQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5X08bX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5X08rX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5X087X-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e5Wm0bX-Ed-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5Wm0rX-Ed-Xj-3H8XK7WQ" x="-24" y="-108" width="219"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e5dUgrX-Ed-Xj-3H8XK7WQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e5d7kLX-Ed-Xj-3H8XK7WQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e5d7kbX-Ed-Xj-3H8XK7WQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_e5eipLX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5eipbX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5fJsbX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/project"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5fJsrX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5fJs7X-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/components"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5fJtLX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5fwwLX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/entryCriteria"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5fwwbX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5fwwrX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/extraNotes"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5fww7X-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5gX0LX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/objectives"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5gX0bX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5gX0rX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/referenceMaterial"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5gX07X-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_jSJroLbFEd-HcNahxkfV5A" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/startDate"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jSJrobbFEd-HcNahxkfV5A"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_nXLAQLbFEd-HcNahxkfV5A" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/endDate"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nXLAQbbFEd-HcNahxkfV5A"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_Bk3lcL0XEd-TWJIwocUqhw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/type"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Bk3lcb0XEd-TWJIwocUqhw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5d7krX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5d7k7X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5d7lLX-Ed-Xj-3H8XK7WQ"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_EIoeQOmvEd-9SopSv7VwjA" value="0.8338461538461538"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e5eioLX-Ed-Xj-3H8XK7WQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5eiobX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5eiorX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5eio7X-Ed-Xj-3H8XK7WQ"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_EIoeQemvEd-9SopSv7VwjA" value="0.11384615384615385"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e5dUg7X-Ed-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5dUhLX-Ed-Xj-3H8XK7WQ" x="696" y="108" height="279"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e5kCMrX-Ed-Xj-3H8XK7WQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e5kpQLX-Ed-Xj-3H8XK7WQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e5kpQbX-Ed-Xj-3H8XK7WQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_e5lQULX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/state"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5lQUbX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5lQUrX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/dueDate"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5lQU7X-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5l3YLX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/rank"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5l3YbX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_ivQWcLqVEd-6aOwQ22t3_g" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/notAcceptedReason"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ivQWcbqVEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_y_Wg0LqVEd-6aOwQ22t3_g" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/isImported"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_y_Wg0bqVEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_KJej8MWgEd-OHt4UvkWdIw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/ruleID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KJej8cWgEd-OHt4UvkWdIw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_Pxop0MWhEd-OHt4UvkWdIw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/decidedByID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Pxop0cWhEd-OHt4UvkWdIw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_X3f9sMWhEd-OHt4UvkWdIw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/fixedByID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_X3f9scWhEd-OHt4UvkWdIw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_cBvJgMWhEd-OHt4UvkWdIw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/followUpByID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cBvJgcWhEd-OHt4UvkWdIw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5kpQrX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5kpQ7X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5kpRLX-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e5kpRbX-Ed-Xj-3H8XK7WQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5kpRrX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5kpR7X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5kpSLX-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e5kCM7X-Ed-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5kCNLX-Ed-Xj-3H8XK7WQ" x="204" y="360"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e5mecLX-Ed-Xj-3H8XK7WQ" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_e5nFgLX-Ed-Xj-3H8XK7WQ" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_e5nFgbX-Ed-Xj-3H8XK7WQ" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_fOoGILqGEd-6aOwQ22t3_g" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_CREATED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fOoGIbqGEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_lnrIULqFEd-6aOwQ22t3_g" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_ASSIGNED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lnrIUbqFEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_VkFI4LqFEd-6aOwQ22t3_g" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_ACCEPTED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VkFI4bqFEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_5OF40LqGEd-6aOwQ22t3_g" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_FIXED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5OF40bqGEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_VkFI4rqFEd-6aOwQ22t3_g" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_DUPLICATED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VkFI47qFEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_VkFI5LqFEd-6aOwQ22t3_g" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_REJECTED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VkFI5bqFEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_VkFI5rqFEd-6aOwQ22t3_g" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_DEFERRED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VkFI57qFEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_oXUI8LqGEd-6aOwQ22t3_g" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_VERIFIED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oXUI8bqGEd-6aOwQ22t3_g"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5nFgrX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5nFg7X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5nFhLX-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e5mecbX-Ed-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5mecrX-Ed-Xj-3H8XK7WQ" x="48" y="912" height="183"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e5phwLX-Ed-Xj-3H8XK7WQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e5phw7X-Ed-Xj-3H8XK7WQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e5qI0LX-Ed-Xj-3H8XK7WQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5qI0bX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5qI0rX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5qI07X-Ed-Xj-3H8XK7WQ"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_Bac78LbGEd-HcNahxkfV5A" value="0.5448275862068965"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e5qI1LX-Ed-Xj-3H8XK7WQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5qI1bX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5qI1rX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5qI17X-Ed-Xj-3H8XK7WQ"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_Bac78bbGEd-HcNahxkfV5A" value="0.33793103448275863"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e5phwbX-Ed-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFormalReview"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5phwrX-Ed-Xj-3H8XK7WQ" x="768" y="-72" width="207" height="111"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e5tMILX-Ed-Xj-3H8XK7WQ" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_e5tzMLX-Ed-Xj-3H8XK7WQ" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_e5tzMbX-Ed-Xj-3H8XK7WQ" type="5008">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5tzMrX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5tzM7X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5tzNLX-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e5tMIbX-Ed-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhase"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5tMIrX-Ed-Xj-3H8XK7WQ" x="300" y="912" width="255" height="147"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e5vBVLX-Ed-Xj-3H8XK7WQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_e5voYLX-Ed-Xj-3H8XK7WQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_e5voYbX-Ed-Xj-3H8XK7WQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_e5wPcrX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition/startPosition"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5wPc7X-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_e5w2gLX-Ed-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition/length"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e5w2gbX-Ed-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_wM44YPP9Ed-0svOvi6MM0A" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition/startLine"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_wM44YfP9Ed-0svOvi6MM0A"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_zN3WEPP9Ed-0svOvi6MM0A" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition/endLine"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zN3WEfP9Ed-0svOvi6MM0A"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5voYrX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5voY7X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5voZLX-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_e5voZbX-Ed-Xj-3H8XK7WQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5voZrX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5voZ7X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5voaLX-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e5vBVbX-Ed-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5vBVrX-Ed-Xj-3H8XK7WQ" x="1080" y="852"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_e5w2grX-Ed-Xj-3H8XK7WQ" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_e5xdkLX-Ed-Xj-3H8XK7WQ" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_e5xdkbX-Ed-Xj-3H8XK7WQ" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_iYPaUM_uEd-GSPl2SnbO1w" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole/R4E_ROLE_LEAD"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iYPaUc_uEd-GSPl2SnbO1w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_iYQBYM_uEd-GSPl2SnbO1w" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole/R4E_ROLE_AUTHOR"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iYQBYc_uEd-GSPl2SnbO1w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_iYQBYs_uEd-GSPl2SnbO1w" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole/R4E_ROLE_REVIEWER"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iYQBY8_uEd-GSPl2SnbO1w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_FgMCMM_0Ed-GSPl2SnbO1w" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole/R4E_ROLE_ORGANIZER"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FgMCMc_0Ed-GSPl2SnbO1w"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e5xdkrX-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_e5xdk7X-Ed-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e5xdlLX-Ed-Xj-3H8XK7WQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e5w2g7X-Ed-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5w2hLX-Ed-Xj-3H8XK7WQ" x="564" y="1032" height="123"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_zd8vcLYCEd-Xj-3H8XK7WQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_zd99kLYCEd-Xj-3H8XK7WQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_zd-koLYCEd-Xj-3H8XK7WQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_6rTuALYCEd-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewDecision/spentTime"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6rTuAbYCEd-Xj-3H8XK7WQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_C15J0LYDEd-Xj-3H8XK7WQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewDecision/value"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_C15J0bYDEd-Xj-3H8XK7WQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zd-kobYCEd-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zd-korYCEd-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zd-ko7YCEd-Xj-3H8XK7WQ"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_iBo0ILYDEd-Xj-3H8XK7WQ" value="0.6804733727810651"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_zd-kpLYCEd-Xj-3H8XK7WQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zd-kpbYCEd-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zd-kprYCEd-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zd-kp7YCEd-Xj-3H8XK7WQ"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_iBpbMLYDEd-Xj-3H8XK7WQ" value="0.21893491124260356"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zd8vcbYCEd-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewDecision"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zd8vcrYCEd-Xj-3H8XK7WQ" x="396" y="264" width="195" height="87"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_D8Gj8LYDEd-Xj-3H8XK7WQ" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_D8Gj87YDEd-Xj-3H8XK7WQ" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_D8HLALYDEd-Xj-3H8XK7WQ" type="5008">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_D8HLAbYDEd-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_D8HLArYDEd-Xj-3H8XK7WQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D8HLA7YDEd-Xj-3H8XK7WQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_D8Gj8bYDEd-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDecision"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D8Gj8rYDEd-Xj-3H8XK7WQ" x="792" y="948" width="315" height="135"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xJ9a4LbDEd-HcNahxkfV5A" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_xJ_QELbDEd-HcNahxkfV5A" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_xJ_QEbbDEd-HcNahxkfV5A" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_I8zlALbEEd-HcNahxkfV5A" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/groupPaths"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_I8zlAbbEEd-HcNahxkfV5A"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_Psxy4Lt4Ed-VvI-hm1I52A" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/sequenceIDCounter"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Psxy4bt4Ed-VvI-hm1I52A"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_HfXqUOqQEd-9SopSv7VwjA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/reviewCreatedByMe"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HfXqUeqQEd-9SopSv7VwjA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_qvXWoPEGEd-liaMDr_sRiA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/reviewCompleted"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qvXWofEGEd-liaMDr_sRiA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_1AY6gPEGEd-liaMDr_sRiA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/reviewCompletedCode"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1AY6gfEGEd-liaMDr_sRiA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xJ_QErbDEd-HcNahxkfV5A"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xJ_QE7bDEd-HcNahxkfV5A"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xJ_QFLbDEd-HcNahxkfV5A"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_UT9wsOKZEd-_4rsUiqkbuA" value="0.4777777777777778"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xJ_3ILbDEd-HcNahxkfV5A" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xJ_3IbbDEd-HcNahxkfV5A"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_xJ_3IrbDEd-HcNahxkfV5A"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xJ_3I7bDEd-HcNahxkfV5A"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_UT-XwOKZEd-_4rsUiqkbuA" value="0.3333333333333333"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xJ9a4bbDEd-HcNahxkfV5A" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xJ9a4rbDEd-HcNahxkfV5A" x="204" y="636" width="219" height="147"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_UghugLeCEd-lI8UEEXo2gw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_UgiVkLeCEd-lI8UEEXo2gw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Ugi8oLeCEd-lI8UEEXo2gw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_sr3bsLeDEd-lI8UEEXo2gw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/roles"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sr3bsbeDEd-lI8UEEXo2gw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_8gktwLeHEd-lI8UEEXo2gw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/focusArea"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8gktwbeHEd-lI8UEEXo2gw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_A3BJkLeIEd-lI8UEEXo2gw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/isPartOfDecision"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_A3BJkbeIEd-lI8UEEXo2gw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ugi8obeCEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ugi8oreCEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ugi8o7eCEd-lI8UEEXo2gw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ugi8pLeCEd-lI8UEEXo2gw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ugi8pbeCEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ugi8preCEd-lI8UEEXo2gw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ugi8p7eCEd-lI8UEEXo2gw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_UghugbeCEd-lI8UEEXo2gw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UghugreCEd-lI8UEEXo2gw" x="468" y="720" width="207" height="123"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_NjunULqqEd-6aOwQ22t3_g" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_NjunU7qqEd-6aOwQ22t3_g" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_NjunVLqqEd-6aOwQ22t3_g" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_t62i0LquEd-6aOwQ22t3_g" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/description"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_t62i0bquEd-6aOwQ22t3_g"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_qM8OgMWiEd-OHt4UvkWdIw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/addedById"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qM8OgcWiEd-OHt4UvkWdIw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_ojEeAQbaEeCvc-HZOPcedA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/repositoryRef"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ojEeAgbaEeCvc-HZOPcedA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_BGyrcAbbEeCvc-HZOPcedA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/ProjectURIs"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_BGyrcQbbEeCvc-HZOPcedA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_ZLHLgD4PEeCMwZzAYLFqBw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/authorRep"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZLHLgT4PEeCMwZzAYLFqBw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_9ddGwD4QEeCMwZzAYLFqBw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/submitted"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9ddGwT4QEeCMwZzAYLFqBw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NjunVbqqEd-6aOwQ22t3_g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_NjunVrqqEd-6aOwQ22t3_g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NjunV7qqEd-6aOwQ22t3_g"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_NjunWLqqEd-6aOwQ22t3_g" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NjunWbqqEd-6aOwQ22t3_g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_NjunWrqqEd-6aOwQ22t3_g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NjunW7qqEd-6aOwQ22t3_g"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_NjunUbqqEd-6aOwQ22t3_g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NjunUrqqEd-6aOwQ22t3_g" x="1164" y="276"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_bEoKELq2Ed-6aOwQ22t3_g" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_bEoKE7q2Ed-6aOwQ22t3_g" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_bEoKFLq2Ed-6aOwQ22t3_g" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_e9rfQLq2Ed-6aOwQ22t3_g" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextContent/content"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_e9rfQbq2Ed-6aOwQ22t3_g"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bEoKFbq2Ed-6aOwQ22t3_g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_bEoKFrq2Ed-6aOwQ22t3_g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bEoKF7q2Ed-6aOwQ22t3_g"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_bEoKGLq2Ed-6aOwQ22t3_g" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bEoKGbq2Ed-6aOwQ22t3_g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_bEoKGrq2Ed-6aOwQ22t3_g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bEoKG7q2Ed-6aOwQ22t3_g"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_bEoKEbq2Ed-6aOwQ22t3_g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextContent"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bEoKErq2Ed-6aOwQ22t3_g" x="1248" y="864"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_9EsdcLt3Ed-VvI-hm1I52A" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_9EtrkLt3Ed-VvI-hm1I52A" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_9EuSoLt3Ed-VvI-hm1I52A" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_Qk1RsLt3Ed-VvI-hm1I52A" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EID/sequenceID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Qk1Rsbt3Ed-VvI-hm1I52A"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_CkGscLt4Ed-VvI-hm1I52A" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EID/userID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_CkGscbt4Ed-VvI-hm1I52A"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9EuSobt3Ed-VvI-hm1I52A"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_9EuSort3Ed-VvI-hm1I52A"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9EuSo7t3Ed-VvI-hm1I52A"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_9Eu5sLt3Ed-VvI-hm1I52A" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Eu5sbt3Ed-VvI-hm1I52A"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_9Eu5srt3Ed-VvI-hm1I52A"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Eu5s7t3Ed-VvI-hm1I52A"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_9Esdcbt3Ed-VvI-hm1I52A" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EID"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Esdcrt3Ed-VvI-hm1I52A" x="132" y="840"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_Q94zUb0WEd-TWJIwocUqhw" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_Q97PkL0WEd-TWJIwocUqhw" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_Q972oL0WEd-TWJIwocUqhw" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_swIyQL0WEd-TWJIwocUqhw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewType/R4E_REVIEW_TYPE_BASIC"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_swIyQb0WEd-TWJIwocUqhw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_xK3RIL0WEd-TWJIwocUqhw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewType/R4E_REVIEW_TYPE_INFORMAL"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xK3RIb0WEd-TWJIwocUqhw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_32WRsL0WEd-TWJIwocUqhw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewType/R4E_REVIEW_TYPE_FORMAL"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_32W4wL0WEd-TWJIwocUqhw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Q972ob0WEd-TWJIwocUqhw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Q972or0WEd-TWJIwocUqhw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Q972o70WEd-TWJIwocUqhw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Q94zUr0WEd-TWJIwocUqhw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewType"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q94zU70WEd-TWJIwocUqhw" x="300" y="1068" width="219" height="99"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_zSKCYMWpEd-OHt4UvkWdIw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_zSKpcMWpEd-OHt4UvkWdIw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_zSKpccWpEd-OHt4UvkWdIw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_6v1U4MWpEd-OHt4UvkWdIw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyType/type"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6v1U4cWpEd-OHt4UvkWdIw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zSKpcsWpEd-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zSKpc8WpEd-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zSKpdMWpEd-OHt4UvkWdIw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_zSLQgMWpEd-OHt4UvkWdIw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zSLQgcWpEd-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_zSLQgsWpEd-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zSLQg8WpEd-OHt4UvkWdIw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zSKCYcWpEd-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyType"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zSKCYsWpEd-OHt4UvkWdIw" x="192" y="156" width="143"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_R1u7oMW5Ed-OHt4UvkWdIw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_R1u7o8W5Ed-OHt4UvkWdIw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_R1u7pMW5Ed-OHt4UvkWdIw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_R1u7pcW5Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_R1u7psW5Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_R1u7p8W5Ed-OHt4UvkWdIw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_R1u7qMW5Ed-OHt4UvkWdIw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_R1u7qcW5Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_R1u7qsW5Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_R1u7q8W5Ed-OHt4UvkWdIw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_R1u7ocW5Ed-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETaskReference"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R1u7osW5Ed-OHt4UvkWdIw" x="-48" y="312" width="147"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_bhHb0MW5Ed-OHt4UvkWdIw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_bhHb08W5Ed-OHt4UvkWdIw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_bhHb1MW5Ed-OHt4UvkWdIw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_DuzlgcZvEd-yNPnU2KSpWg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewState/state"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DuzlgsZvEd-yNPnU2KSpWg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bhHb1cW5Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_bhHb1sW5Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bhHb18W5Ed-OHt4UvkWdIw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_bhHb2MW5Ed-OHt4UvkWdIw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bhHb2cW5Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_bhHb2sW5Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bhHb28W5Ed-OHt4UvkWdIw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_bhHb0cW5Ed-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewState"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bhHb0sW5Ed-OHt4UvkWdIw" x="-48" y="372" width="171" height="63"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_i0IhAMW6Ed-OHt4UvkWdIw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_i0IhA8W6Ed-OHt4UvkWdIw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_i0IhBMW6Ed-OHt4UvkWdIw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_Nxvq4NADEd-GSPl2SnbO1w" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EComment/createdOn"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Nxvq4dADEd-GSPl2SnbO1w"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_i0IhBcW6Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i0IhBsW6Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i0IhB8W6Ed-OHt4UvkWdIw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_i0IhCMW6Ed-OHt4UvkWdIw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_i0IhCcW6Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_i0IhCsW6Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i0IhC8W6Ed-OHt4UvkWdIw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_i0IhAcW6Ed-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EComment"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i0IhAsW6Ed-OHt4UvkWdIw" x="-48" y="576"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_0EcyQMW6Ed-OHt4UvkWdIw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_0EmjQMW6Ed-OHt4UvkWdIw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_0EmjQcW6Ed-OHt4UvkWdIw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_9uH7AUXzEeGWe_5Mt5Meuw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewComponent/assignedTo"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9uH7AkXzEeGWe_5Mt5Meuw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0EmjQsW6Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0EmjQ8W6Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EmjRMW6Ed-OHt4UvkWdIw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0EmjRcW6Ed-OHt4UvkWdIw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0EmjRsW6Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_0EmjR8W6Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0EmjSMW6Ed-OHt4UvkWdIw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0EcyQcW6Ed-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewComponent"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0EcyQsW6Ed-OHt4UvkWdIw" x="912" y="168" width="171"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_gMAywMW7Ed-OHt4UvkWdIw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_gMAyw8W7Ed-OHt4UvkWdIw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_gMAyxMW7Ed-OHt4UvkWdIw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_4DNPID4REeCMwZzAYLFqBw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/type"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4DNPIT4REeCMwZzAYLFqBw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_gMAyxcW7Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_gMAyxsW7Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_gMAyx8W7Ed-OHt4UvkWdIw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_gMAyyMW7Ed-OHt4UvkWdIw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_gMAyycW7Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_gMAyysW7Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_gMAyy8W7Ed-OHt4UvkWdIw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_gMAywcW7Ed-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gMAywsW7Ed-OHt4UvkWdIw" x="1176" y="480"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_PMT68MW8Ed-OHt4UvkWdIw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_PMT688W8Ed-OHt4UvkWdIw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_PMT69MW8Ed-OHt4UvkWdIw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_PMT69cW8Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_PMT69sW8Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PMT698W8Ed-OHt4UvkWdIw"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_PMT6-MW8Ed-OHt4UvkWdIw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_PMT6-cW8Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_PMT6-sW8Ed-OHt4UvkWdIw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PMT6-8W8Ed-OHt4UvkWdIw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_PMT68cW8Ed-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDelta"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PMT68sW8Ed-OHt4UvkWdIw" x="1284" y="600"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_O8-9kMoyEd-GnoJBk9E8XQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_O9AywMoyEd-GnoJBk9E8XQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_O9BZ0MoyEd-GnoJBk9E8XQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_Utu0MMoyEd-GnoJBk9E8XQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ECommentType/type"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Utu0McoyEd-GnoJBk9E8XQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_O9BZ0coyEd-GnoJBk9E8XQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_O9BZ0soyEd-GnoJBk9E8XQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_O9BZ08oyEd-GnoJBk9E8XQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_O9Cn8MoyEd-GnoJBk9E8XQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_O9Cn8coyEd-GnoJBk9E8XQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_O9Cn8soyEd-GnoJBk9E8XQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_O9Cn88oyEd-GnoJBk9E8XQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_O8-9kcoyEd-GnoJBk9E8XQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ECommentType"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O8-9ksoyEd-GnoJBk9E8XQ" x="-48" y="444" width="207"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_Ksj08MpYEd-GnoJBk9E8XQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_KskcAMpYEd-GnoJBk9E8XQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_KskcAcpYEd-GnoJBk9E8XQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_TanxQMpYEd-GnoJBk9E8XQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToAnomalyType/key"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TanxQcpYEd-GnoJBk9E8XQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KskcAspYEd-GnoJBk9E8XQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KskcA8pYEd-GnoJBk9E8XQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KskcBMpYEd-GnoJBk9E8XQ"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_KskcBcpYEd-GnoJBk9E8XQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_KskcBspYEd-GnoJBk9E8XQ"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_KskcB8pYEd-GnoJBk9E8XQ"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KskcCMpYEd-GnoJBk9E8XQ"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Ksj08cpYEd-GnoJBk9E8XQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToAnomalyType"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ksj08spYEd-GnoJBk9E8XQ" x="-24" y="156" width="159"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_6Ne2cOHcEd-yzYXzzLJ5Xg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_6NgEkOHcEd-yzYXzzLJ5Xg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_6NgroOHcEd-yzYXzzLJ5Xg" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_MyN2wPfzEd-WaLZjXTHHFA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContent/info"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_MyN2wffzEd-WaLZjXTHHFA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6NhSsOHcEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_6NhSseHcEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6NhSsuHcEd-yzYXzzLJ5Xg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_6Nh5wOHcEd-yzYXzzLJ5Xg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6Nh5weHcEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_6Nh5wuHcEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6Nh5w-HcEd-yzYXzzLJ5Xg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_6Ne2ceHcEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContent"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6Ne2cuHcEd-yzYXzzLJ5Xg" x="1267" y="779"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_sf86AOHdEd-yzYXzzLJ5Xg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_sf9hEOHdEd-yzYXzzLJ5Xg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_sf-IIOHdEd-yzYXzzLJ5Xg" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_sf-IIeHdEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_sf-IIuHdEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_sf-II-HdEd-yzYXzzLJ5Xg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_sf-IJOHdEd-yzYXzzLJ5Xg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_sf-IJeHdEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_sf-IJuHdEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_sf-IJ-HdEd-yzYXzzLJ5Xg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_sf86AeHdEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EPosition"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sf86AuHdEd-yzYXzzLJ5Xg" x="1087" y="779"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_jeN-UOHeEd-yzYXzzLJ5Xg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_jeOlYOHeEd-yzYXzzLJ5Xg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_jePMcOHeEd-yzYXzzLJ5Xg" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_XN228QbgEeCk0o6ggnK7Bw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/platformURI"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XN228gbgEeCk0o6ggnK7Bw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_m9LYgOHeEd-yzYXzzLJ5Xg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/versionID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_m9LYgeHeEd-yzYXzzLJ5Xg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_rN2jgOHeEd-yzYXzzLJ5Xg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/repositoryPath"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rN2jgeHeEd-yzYXzzLJ5Xg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_tFI1QOHeEd-yzYXzzLJ5Xg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tFI1QeHeEd-yzYXzzLJ5Xg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_uapPoOHeEd-yzYXzzLJ5Xg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/resource"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uapPoeHeEd-yzYXzzLJ5Xg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_k2iJcD4SEeCMwZzAYLFqBw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/localVersionID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_k2iJcT4SEeCMwZzAYLFqBw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_qB0r4D69EeCqhrBOB88LTg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/fileRevision"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qB0r4T69EeCqhrBOB88LTg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_jePMceHeEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_jePMcuHeEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jePMc-HeEd-yzYXzzLJ5Xg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_jePMdOHeEd-yzYXzzLJ5Xg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_jePMdeHeEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_jePMduHeEd-yzYXzzLJ5Xg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jePMd-HeEd-yzYXzzLJ5Xg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_jeN-UeHeEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jeN-UuHeEd-yzYXzzLJ5Xg" x="1056" y="600"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_SFBL8OHgEd-yzYXzzLJ5Xg" type="1004">

-    <children xmi:type="notation:Node" xmi:id="_SFBzAOHgEd-yzYXzzLJ5Xg" type="4008"/>

-    <children xmi:type="notation:Node" xmi:id="_SFBzAeHgEd-yzYXzzLJ5Xg" type="4009"/>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_SFBL8eHgEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EDataType" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//IResource"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SFBL8uHgEd-yzYXzzLJ5Xg" x="792" y="1092" width="315"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_MFkgEOHiEd-yzYXzzLJ5Xg" type="Note" fontName="Segoe UI" description="R4EREviewComponent extended by: R4EDelta, R4EFileContext, R4EReviewGroup, R4EReview, R4ETaskReference, R4EComment, R4EAnomaly, R4EItem, R4EUser" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-    <children xmi:type="notation:BasicDecorationNode" xmi:id="_MFp_oOHiEd-yzYXzzLJ5Xg" type="DiagramName">

-      <element xsi:nil="true"/>

-    </children>

-    <children xmi:type="notation:BasicDecorationNode" xmi:id="_MFqmsOHiEd-yzYXzzLJ5Xg" type="Description">

-      <element xsi:nil="true"/>

-    </children>

-    <styles xmi:type="notation:TextStyle" xmi:id="_MFkgEeHiEd-yzYXzzLJ5Xg"/>

-    <styles xmi:type="notation:LineTypeStyle" xmi:id="_MFkgEuHiEd-yzYXzzLJ5Xg"/>

-    <element xsi:nil="true"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MFkgE-HiEd-yzYXzzLJ5Xg" x="1128" y="84" width="241" height="121"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_xmbYoeeQEd-aIbfpdqi1RA" type="1004">

-    <children xmi:type="notation:Node" xmi:id="_xmgRIOeQEd-aIbfpdqi1RA" type="4008"/>

-    <children xmi:type="notation:Node" xmi:id="_xmg4MOeQEd-aIbfpdqi1RA" type="4009"/>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xmb_sOeQEd-aIbfpdqi1RA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EDataType" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//URI"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xmb_seeQEd-aIbfpdqi1RA" x="-48" y="228" width="160" height="73"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_OTjUAekIEd--FZQPkuXOdg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_OTjUBOkIEd--FZQPkuXOdg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_OTjUBekIEd--FZQPkuXOdg" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_bbA5gOkIEd--FZQPkuXOdg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapNameToReview/key"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bbA5gekIEd--FZQPkuXOdg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_OTjUBukIEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_OTjUB-kIEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OTjUCOkIEd--FZQPkuXOdg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_OTtFAOkIEd--FZQPkuXOdg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_OTtFAekIEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_OTtFAukIEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OTtFA-kIEd--FZQPkuXOdg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_OTjUAukIEd--FZQPkuXOdg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapNameToReview"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OTjUA-kIEd--FZQPkuXOdg" x="408" y="180"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ppNWMOkLEd--FZQPkuXOdg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_ppNWM-kLEd--FZQPkuXOdg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ppNWNOkLEd--FZQPkuXOdg" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_5xzKYOkLEd--FZQPkuXOdg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToUsers/key"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5xzKYekLEd--FZQPkuXOdg"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ppNWNekLEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ppNWNukLEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ppNWN-kLEd--FZQPkuXOdg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ppNWOOkLEd--FZQPkuXOdg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ppNWOekLEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ppNWOukLEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ppNWO-kLEd--FZQPkuXOdg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ppNWMekLEd--FZQPkuXOdg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToUsers"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppNWMukLEd--FZQPkuXOdg" x="564" y="516"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_Axg6QOknEd--FZQPkuXOdg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_AxiIYOknEd--FZQPkuXOdg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_AxiIYeknEd--FZQPkuXOdg" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_Lv89wOknEd--FZQPkuXOdg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lv89weknEd--FZQPkuXOdg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_vEfaYOqQEd-9SopSv7VwjA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews/createdReviews"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_vEfaYeqQEd-9SopSv7VwjA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_AxiIYuknEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_AxiIY-knEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_AxiIZOknEd--FZQPkuXOdg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_AxiIZeknEd--FZQPkuXOdg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_AxivcOknEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_AxivceknEd--FZQPkuXOdg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_AxivcuknEd--FZQPkuXOdg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Axg6QeknEd--FZQPkuXOdg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Axg6QuknEd--FZQPkuXOdg" x="336" y="-24" width="177"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_jr4t0OmoEd-9SopSv7VwjA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_jr7xIOmoEd-9SopSv7VwjA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_jr8YMOmoEd-9SopSv7VwjA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_jr8YMemoEd-9SopSv7VwjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_jr8YMumoEd-9SopSv7VwjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jr8YM-moEd-9SopSv7VwjA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_jr9mUOmoEd-9SopSv7VwjA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_jr9mUemoEd-9SopSv7VwjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_jr9mUumoEd-9SopSv7VwjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jr9mU-moEd-9SopSv7VwjA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_jr4t0emoEd-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EIDComponent"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jr4t0umoEd-9SopSv7VwjA" x="936" y="240"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_WQ-ZIOmuEd-9SopSv7VwjA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_WQ_AMOmuEd-9SopSv7VwjA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_WQ_nQOmuEd-9SopSv7VwjA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_WQ_nQemuEd-9SopSv7VwjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WQ_nQumuEd-9SopSv7VwjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WQ_nQ-muEd-9SopSv7VwjA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_WQ_nROmuEd-9SopSv7VwjA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_WQ_nRemuEd-9SopSv7VwjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_WQ_nRumuEd-9SopSv7VwjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WQ_nR-muEd-9SopSv7VwjA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_WQ-ZIemuEd-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapIDToComponent"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WQ-ZIumuEd-9SopSv7VwjA" x="804" y="528" width="166"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_K_3pgOp4Ed-9SopSv7VwjA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_K_4QkOp4Ed-9SopSv7VwjA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_K_4Qkep4Ed-9SopSv7VwjA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_1UXJ4Op4Ed-9SopSv7VwjA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapUserIDToUserReviews/key"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1UXJ4ep4Ed-9SopSv7VwjA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_K_4Qkup4Ed-9SopSv7VwjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_K_4Qk-p4Ed-9SopSv7VwjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_K_4QlOp4Ed-9SopSv7VwjA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_K_43oOp4Ed-9SopSv7VwjA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_K_43oep4Ed-9SopSv7VwjA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_K_43oup4Ed-9SopSv7VwjA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_K_43o-p4Ed-9SopSv7VwjA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_K_3pgep4Ed-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapUserIDToUserReviews"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K_3pgup4Ed-9SopSv7VwjA" x="336" y="-108"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_ruqP4PfqEd-WaLZjXTHHFA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_rutTMPfqEd-WaLZjXTHHFA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_rut6QPfqEd-WaLZjXTHHFA" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_rut6QffqEd-WaLZjXTHHFA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_rut6QvfqEd-WaLZjXTHHFA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_rut6Q_fqEd-WaLZjXTHHFA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ruvIYPfqEd-WaLZjXTHHFA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ruvIYffqEd-WaLZjXTHHFA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_ruvIYvfqEd-WaLZjXTHHFA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ruvIY_fqEd-WaLZjXTHHFA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ruqP4ffqEd-WaLZjXTHHFA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyTextPosition"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ruqP4vfqEd-WaLZjXTHHFA" x="852" y="852" width="172" height="53"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_T5cysD4REeCMwZzAYLFqBw" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_T5eA0D4REeCMwZzAYLFqBw" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_T5fO8D4REeCMwZzAYLFqBw" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_ZddYYD4SEeCMwZzAYLFqBw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_UNDEFINED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZddYYT4SEeCMwZzAYLFqBw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_nPk54D4REeCMwZzAYLFqBw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_ADDED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nPk54T4REeCMwZzAYLFqBw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_rMuE4D4REeCMwZzAYLFqBw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_DELETED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rMuE4T4REeCMwZzAYLFqBw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_tCX-8D4REeCMwZzAYLFqBw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_MODIFIED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tCX-8T4REeCMwZzAYLFqBw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_uupTgD4REeCMwZzAYLFqBw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_REPLACED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uupTgT4REeCMwZzAYLFqBw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_T5fO8T4REeCMwZzAYLFqBw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_T5fO8j4REeCMwZzAYLFqBw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_T5fO8z4REeCMwZzAYLFqBw"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_T5cysT4REeCMwZzAYLFqBw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T5cysj4REeCMwZzAYLFqBw" x="1140" y="960" width="149"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_LsYYsD4TEeCMwZzAYLFqBw" type="1004">

-    <children xmi:type="notation:Node" xmi:id="_LsaN4D4TEeCMwZzAYLFqBw" type="4008"/>

-    <children xmi:type="notation:Node" xmi:id="_Lsa08D4TEeCMwZzAYLFqBw" type="4009"/>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_LsY_wD4TEeCMwZzAYLFqBw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EDataType" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//IFileRevision"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LsY_wT4TEeCMwZzAYLFqBw" x="1140" y="1117" height="62"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_PZB20EQ4EeCXbIx_qEv2wA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_PZETEEQ4EeCXbIx_qEv2wA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_PZETEUQ4EeCXbIx_qEv2wA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_c-cjoEQ4EeCXbIx_qEv2wA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapDateToDuration/key"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_c-cjoUQ4EeCXbIx_qEv2wA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_hYtIcEQ4EeCXbIx_qEv2wA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapDateToDuration/value"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hYtIcUQ4EeCXbIx_qEv2wA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_PZETEkQ4EeCXbIx_qEv2wA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_PZETE0Q4EeCXbIx_qEv2wA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PZETFEQ4EeCXbIx_qEv2wA"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_CNDWAEQ-EeCXbIx_qEv2wA" value="0.5877192982456141"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_PZE6IEQ4EeCXbIx_qEv2wA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_PZE6IUQ4EeCXbIx_qEv2wA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_PZE6IkQ4EeCXbIx_qEv2wA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PZE6I0Q4EeCXbIx_qEv2wA"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_CND9EEQ-EeCXbIx_qEv2wA" value="0.2631578947368421"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_PZB20UQ4EeCXbIx_qEv2wA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapDateToDuration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PZB20kQ4EeCXbIx_qEv2wA" x="-24" y="684" width="171" height="123"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_N2lFQEQ7EeCXbIx_qEv2wA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_N2lsUEQ7EeCXbIx_qEv2wA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_N2lsUUQ7EeCXbIx_qEv2wA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_ZC5MsEQ7EeCXbIx_qEv2wA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapKeyToInfoAttributes/key"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZC5MsUQ7EeCXbIx_qEv2wA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_bRIl4EQ7EeCXbIx_qEv2wA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapKeyToInfoAttributes/value"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_bRIl4UQ7EeCXbIx_qEv2wA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_N2lsUkQ7EeCXbIx_qEv2wA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_N2lsU0Q7EeCXbIx_qEv2wA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_N2lsVEQ7EeCXbIx_qEv2wA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_N2lsVUQ7EeCXbIx_qEv2wA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_N2lsVkQ7EeCXbIx_qEv2wA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_N2lsV0Q7EeCXbIx_qEv2wA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_N2lsWEQ7EeCXbIx_qEv2wA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_N2lFQUQ7EeCXbIx_qEv2wA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapKeyToInfoAttributes"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N2lFQkQ7EeCXbIx_qEv2wA" x="1416" y="360" width="171"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_NSQS0UsjEeCkEvu0hBjtTg" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_NSUkQEsjEeCkEvu0hBjtTg" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_NSVLUEsjEeCkEvu0hBjtTg" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_JnMooUtrEeCpWeh4YKtbZg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo/startDate"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_JnMooktrEeCpWeh4YKtbZg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_aHlmgEsjEeCkEvu0hBjtTg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo/endDate"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_aHlmgUsjEeCkEvu0hBjtTg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_te1IAEsjEeCkEvu0hBjtTg" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo/type"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_te1IAUsjEeCkEvu0hBjtTg"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_xaE1gMWgEd-OHt4UvkWdIw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo/phaseOwnerID"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xaE1gcWgEd-OHt4UvkWdIw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NSVyYEsjEeCkEvu0hBjtTg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_NSVyYUsjEeCkEvu0hBjtTg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NSVyYksjEeCkEvu0hBjtTg"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_NSWZcEsjEeCkEvu0hBjtTg" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NSWZcUsjEeCkEvu0hBjtTg"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_NSWZcksjEeCkEvu0hBjtTg"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NSWZc0sjEeCkEvu0hBjtTg"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_NSQS0ksjEeCkEvu0hBjtTg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NSQS00sjEeCkEvu0hBjtTg" x="1092" y="-72" width="177" height="118"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_EnkEsGFKEeCFVY01TT49FA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Enl54GFKEeCFVY01TT49FA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Enl54WFKEeCFVY01TT49FA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_KukfMGFKEeCFVY01TT49FA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/id"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KukfMWFKEeCFVY01TT49FA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_6ABQMGeJEeCyS4QRgXNGnA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/body"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6ABQMWeJEeCyS4QRgXNGnA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_T699UGFKEeCFVY01TT49FA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/subject"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_T699UWFKEeCFVY01TT49FA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_YTGbMGFKEeCFVY01TT49FA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/location"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YTGbMWFKEeCFVY01TT49FA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_cP1WgGFKEeCFVY01TT49FA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/startTime"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cP1WgWFKEeCFVY01TT49FA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_kxywgGFKEeCFVY01TT49FA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/duration"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kxywgWFKEeCFVY01TT49FA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_sPf4MGFKEeCFVY01TT49FA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/sentCount"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_sPf4MWFKEeCFVY01TT49FA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_5eF0YWd0EeCyS4QRgXNGnA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/sender"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5eGbcGd0EeCyS4QRgXNGnA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_ABNjIGd1EeCyS4QRgXNGnA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/receivers"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ABNjIWd1EeCyS4QRgXNGnA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Enl54mFKEeCFVY01TT49FA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Enl542FKEeCFVY01TT49FA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Enl55GFKEeCFVY01TT49FA"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_hl8fkGFKEeCFVY01TT49FA" value="0.533678756476684"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Enmg8GFKEeCFVY01TT49FA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Enmg8WFKEeCFVY01TT49FA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_Enmg8mFKEeCFVY01TT49FA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Enmg82FKEeCFVY01TT49FA"/>

-      <layoutConstraint xmi:type="notation:Ratio" xmi:id="_hl9GoGFKEeCFVY01TT49FA" value="0.37823834196891193"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EnkEsWFKEeCFVY01TT49FA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EnkEsmFKEeCFVY01TT49FA" x="569" y="-132" width="154" height="195"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_e47JAbX-Ed-Xj-3H8XK7WQ"/>

-  <element xmi:type="ecore:EPackage" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_e529JLX-Ed-Xj-3H8XK7WQ" type="3003" source="_e5phwLX-Ed-Xj-3H8XK7WQ" target="_e5dUgrX-Ed-Xj-3H8XK7WQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e529JbX-Ed-Xj-3H8XK7WQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e529JrX-Ed-Xj-3H8XK7WQ" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e529J7X-Ed-Xj-3H8XK7WQ" points="[98, 59, -79, -205]$[98, 166, -79, -98]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e7jmQLX-Ed-Xj-3H8XK7WQ" id="(0.3526570048309179,0.9279279279279279)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e7jmQbX-Ed-Xj-3H8XK7WQ" id="(0.46236559139784944,0.024464831804281346)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_TtSkwLYDEd-Xj-3H8XK7WQ" type="3002" source="_e5dUgrX-Ed-Xj-3H8XK7WQ" target="_zd8vcLYCEd-Xj-3H8XK7WQ">

-    <children xmi:type="notation:Node" xmi:id="_TtSkxLYDEd-Xj-3H8XK7WQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TtSkxbYDEd-Xj-3H8XK7WQ" x="-36" y="-25"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_TtTL0LYDEd-Xj-3H8XK7WQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TtTL0bYDEd-Xj-3H8XK7WQ" x="1" y="-9"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_TtSkwbYDEd-Xj-3H8XK7WQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_TtSkwrYDEd-Xj-3H8XK7WQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/decision"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TtSkw7YDEd-Xj-3H8XK7WQ" points="[-23, 49, 52, -113]$[-72, 156, 3, -6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TtWPILYDEd-Xj-3H8XK7WQ" id="(0.0913978494623656,0.30275229357798167)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TtWPIbYDEd-Xj-3H8XK7WQ" id="(0.9487179487179487,0.42528735632183906)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_oVDA8LbJEd-HcNahxkfV5A" type="3002" source="_e5phwLX-Ed-Xj-3H8XK7WQ" target="_UghugLeCEd-lI8UEEXo2gw">

-    <children xmi:type="notation:Node" xmi:id="_oVEPELbJEd-HcNahxkfV5A" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oVEPEbbJEd-HcNahxkfV5A" x="70" y="-44"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oVEPErbJEd-HcNahxkfV5A" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oVEPE7bJEd-HcNahxkfV5A" x="107" y="-9"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_oVDoALbJEd-HcNahxkfV5A" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_oVDoAbbJEd-HcNahxkfV5A" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFormalReview/phaseOwner"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oVDoArbJEd-HcNahxkfV5A" points="[0, 1, 235, -779]$[6, 384, 241, -396]$[-174, 432, 61, -348]$[-221, 701, 14, -79]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oVHSYLbJEd-HcNahxkfV5A" id="(0.6376811594202898,0.990990990990991)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oVHSYbbJEd-HcNahxkfV5A" id="(0.9323671497584541,0.7967479674796748)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_X1yR0LbMEd-HcNahxkfV5A" type="3002" source="_e5dUgrX-Ed-Xj-3H8XK7WQ" target="_e5kCMrX-Ed-Xj-3H8XK7WQ">

-    <children xmi:type="notation:Node" xmi:id="_X1y44LbMEd-HcNahxkfV5A" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_X1y44bbMEd-HcNahxkfV5A" x="-40" y="-15"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_X1y44rbMEd-HcNahxkfV5A" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_X1y447bMEd-HcNahxkfV5A" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_X1yR0bbMEd-HcNahxkfV5A" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_X1yR0rbMEd-HcNahxkfV5A" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/anomalyTemplate"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_X1yR07bMEd-HcNahxkfV5A" points="[-11, 1, 299, -31]$[-294, 30, 16, -2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X12jQLbMEd-HcNahxkfV5A" id="(0.06451612903225806,0.7828746177370031)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_X12jQbbMEd-HcNahxkfV5A" id="(0.9195979899497487,0.23039215686274508)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_NZHxgLeDEd-lI8UEEXo2gw" type="3003" source="_UghugLeCEd-lI8UEEXo2gw" target="_xJ9a4LbDEd-HcNahxkfV5A">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_NZHxgbeDEd-lI8UEEXo2gw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_NZHxgreDEd-lI8UEEXo2gw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NZHxg7eDEd-lI8UEEXo2gw" points="[-112, 39, -22, -51]$[-112, 86, -22, -4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NZKNwLeDEd-lI8UEEXo2gw" id="(0.028985507246376812,0.7073170731707317)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TMBkQLeDEd-lI8UEEXo2gw" id="(0.46,0.9215686274509803)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_fJiHUMTlEd-et90B0t7vvA" type="3002" source="_UghugLeCEd-lI8UEEXo2gw" target="_9EsdcLt3Ed-VvI-hm1I52A">

-    <children xmi:type="notation:Node" xmi:id="_fJjVcMTlEd-et90B0t7vvA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_fJjVccTlEd-et90B0t7vvA" x="-57" y="12"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_fJj8gMTlEd-et90B0t7vvA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_fJj8gcTlEd-et90B0t7vvA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_fJiHUcTlEd-et90B0t7vvA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_fJiHUsTlEd-et90B0t7vvA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/reviewedContent"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fJiHU8TlEd-et90B0t7vvA" points="[-35, 7, 384, -9]$[-80, 16, 339, 0]$[-407, 16, 12, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fJnm4MTlEd-et90B0t7vvA" id="(0.22705314009661837,0.9512195121951219)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fJnm4cTlEd-et90B0t7vvA" id="(0.9847328244274809,0.2647058823529412)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_r9uWAMWqEd-OHt4UvkWdIw" type="3002" source="_e5Wm0LX-Ed-Xj-3H8XK7WQ" target="_zSKCYMWpEd-OHt4UvkWdIw">

-    <children xmi:type="notation:Node" xmi:id="_r9u9EMWqEd-OHt4UvkWdIw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_r9u9EcWqEd-OHt4UvkWdIw" x="-13" y="-36"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_r9vkIMWqEd-OHt4UvkWdIw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_r9vkIcWqEd-OHt4UvkWdIw" x="-10" y="18"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_r9uWAcWqEd-OHt4UvkWdIw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_r9uWAsWqEd-OHt4UvkWdIw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/availableAnomalyTypes"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r9uWA8WqEd-OHt4UvkWdIw" points="[29, 10, -178, -62]$[148, 48, -59, -24]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r9yAYMWqEd-OHt4UvkWdIw" id="(0.7625570776255708,0.9647058823529412)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_JYYScMpnEd-GnoJBk9E8XQ" type="3002" source="_Ksj08MpYEd-GnoJBk9E8XQ" target="_zSKCYMWpEd-OHt4UvkWdIw">

-    <children xmi:type="notation:Node" xmi:id="_JYY5gMpnEd-GnoJBk9E8XQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_JYY5gcpnEd-GnoJBk9E8XQ" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_JYY5gspnEd-GnoJBk9E8XQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_JYY5g8pnEd-GnoJBk9E8XQ" x="-17" y="18"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_JYYSccpnEd-GnoJBk9E8XQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_JYYScspnEd-GnoJBk9E8XQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToAnomalyType/value"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JYYSc8pnEd-GnoJBk9E8XQ" points="[26, 3, -92, 2]$[119, 24, 1, 23]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JYcj4MpnEd-GnoJBk9E8XQ" id="(0.8364779874213837,0.5294117647058824)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JYcj4cpnEd-GnoJBk9E8XQ" id="(0.23776223776223776,0.5490196078431373)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_IbNqIMpoEd-GnoJBk9E8XQ" type="3002" source="_e5Wm0LX-Ed-Xj-3H8XK7WQ" target="_Ksj08MpYEd-GnoJBk9E8XQ">

-    <children xmi:type="notation:Node" xmi:id="_IbORMMpoEd-GnoJBk9E8XQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IbORMcpoEd-GnoJBk9E8XQ" x="-25" y="-2"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_IbO4QMpoEd-GnoJBk9E8XQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IbO4QcpoEd-GnoJBk9E8XQ" x="2" y="12"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_IbNqIcpoEd-GnoJBk9E8XQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_IbNqIspoEd-GnoJBk9E8XQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/anomalyTypeKeyToReference"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IbNqI8poEd-GnoJBk9E8XQ" points="[-1, 3, 34, -95]$[-34, 97, 1, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IbR7kMpoEd-GnoJBk9E8XQ" id="(0.3333333333333333,0.9803921568627451)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IbR7kcpoEd-GnoJBk9E8XQ" id="(0.5220125786163522,0.0392156862745098)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Nn9EYOHYEd-yzYXzzLJ5Xg" type="3002" source="_NjunULqqEd-6aOwQ22t3_g" target="_gMAywMW7Ed-OHt4UvkWdIw">

-    <children xmi:type="notation:Node" xmi:id="_Nn9rcOHYEd-yzYXzzLJ5Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Nn9rceHYEd-yzYXzzLJ5Xg" x="-12" y="-53"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Nn9rcuHYEd-yzYXzzLJ5Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Nn9rc-HYEd-yzYXzzLJ5Xg" x="-1" y="-23"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Nn9EYeHYEd-yzYXzzLJ5Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Nn9EYuHYEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/fileContextList"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nn9EY-HYEd-yzYXzzLJ5Xg" points="[2, 15, -21, -108]$[17, 88, -6, -35]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VmcckOHmEd-yzYXzzLJ5Xg" id="(0.46621621621621623,0.8235294117647058)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NoBV0OHYEd-yzYXzzLJ5Xg" id="(0.5327102803738317,0.8604651162790697)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_XN4c0OHYEd-yzYXzzLJ5Xg" type="3002" source="_gMAywMW7Ed-OHt4UvkWdIw" target="_PMT68MW8Ed-OHt4UvkWdIw">

-    <children xmi:type="notation:Node" xmi:id="_XN5D4OHYEd-yzYXzzLJ5Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_XN5D4eHYEd-yzYXzzLJ5Xg" x="7" y="-18"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_XN5q8OHYEd-yzYXzzLJ5Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_XN5q8eHYEd-yzYXzzLJ5Xg" x="-5" y="12"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_XN4c0eHYEd-yzYXzzLJ5Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_XN4c0uHYEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/deltas"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XN4c0-HYEd-yzYXzzLJ5Xg" points="[13, 21, -82, -138]$[56, 88, -39, -71]$[76, 124, -19, -35]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XN8uQeHYEd-yzYXzzLJ5Xg" id="(0.6372549019607843,0.8604651162790697)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ChbCkOHdEd-yzYXzzLJ5Xg" type="3003" source="_bEoKELq2Ed-6aOwQ22t3_g" target="_6Ne2cOHcEd-yzYXzzLJ5Xg">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ChbCkeHdEd-yzYXzzLJ5Xg" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ChbCkuHdEd-yzYXzzLJ5Xg" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ChbCk-HdEd-yzYXzzLJ5Xg" points="[-1, -7, -7, 148]$[-44, -156, -50, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Chde0OHdEd-yzYXzzLJ5Xg" id="(0.48412698412698413,0.0196078431372549)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__klokOHdEd-yzYXzzLJ5Xg" id="(0.39215686274509803,0.8837209302325582)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_NNwCYOHdEd-yzYXzzLJ5Xg" type="3002" source="_PMT68MW8Ed-OHt4UvkWdIw" target="_6Ne2cOHcEd-yzYXzzLJ5Xg">

-    <children xmi:type="notation:Node" xmi:id="_NNwCZOHdEd-yzYXzzLJ5Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NNwCZeHdEd-yzYXzzLJ5Xg" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_NNwCZuHdEd-yzYXzzLJ5Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_NNwCZ-HdEd-yzYXzzLJ5Xg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_NNwCYeHdEd-yzYXzzLJ5Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_NNwCYuHdEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDelta/base"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NNwCY-HdEd-yzYXzzLJ5Xg" points="[-2, -6, 94, 161]$[-46, -166, 50, 1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NNx3kOHdEd-yzYXzzLJ5Xg" id="(0.19607843137254902,0.6744186046511628)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m94pgOHmEd-yzYXzzLJ5Xg" id="(0.38235294117647056,0.046511627906976744)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_RZkikOHdEd-yzYXzzLJ5Xg" type="3002" source="_PMT68MW8Ed-OHt4UvkWdIw" target="_6Ne2cOHcEd-yzYXzzLJ5Xg">

-    <children xmi:type="notation:Node" xmi:id="_RZmXwOHdEd-yzYXzzLJ5Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RZmXweHdEd-yzYXzzLJ5Xg" x="-31" y="-6"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_RZmXwuHdEd-yzYXzzLJ5Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RZm-0OHdEd-yzYXzzLJ5Xg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_RZkikeHdEd-yzYXzzLJ5Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_RZkikuHdEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDelta/target"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RZkik-HdEd-yzYXzzLJ5Xg" points="[9, 38, -22, -181]$[17, 69, -14, -150]$[29, 200, -2, -19]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RZtFcOHdEd-yzYXzzLJ5Xg" id="(0.7156862745098039,0.9534883720930233)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RZtFceHdEd-yzYXzzLJ5Xg" id="(0.9019607843137255,0.16279069767441862)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_18qFAOHdEd-yzYXzzLJ5Xg" type="3003" source="_e5vBVLX-Ed-Xj-3H8XK7WQ" target="_sf86AOHdEd-yzYXzzLJ5Xg">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_18qFAeHdEd-yzYXzzLJ5Xg" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_18qFAuHdEd-yzYXzzLJ5Xg" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_18qFA-HdEd-yzYXzzLJ5Xg" points="[5, -1, -4, 53]$[5, -33, -4, 21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_18tIUOHdEd-yzYXzzLJ5Xg" id="(0.3602941176470588,0.014705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_B2sOEOHeEd-yzYXzzLJ5Xg" type="3002" source="_6Ne2cOHcEd-yzYXzzLJ5Xg" target="_sf86AOHdEd-yzYXzzLJ5Xg">

-    <children xmi:type="notation:Node" xmi:id="_B2s1IOHeEd-yzYXzzLJ5Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_B2s1IeHeEd-yzYXzzLJ5Xg" x="-19" y="-16"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_B2s1IuHeEd-yzYXzzLJ5Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_B2s1I-HeEd-yzYXzzLJ5Xg" x="-6" y="8"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_B2sOEeHeEd-yzYXzzLJ5Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_B2sOEuHeEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContent/location"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_B2sOE-HeEd-yzYXzzLJ5Xg" points="[-11, 3, 101, 1]$[-110, -14, 2, -16]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_B2wfgOHeEd-yzYXzzLJ5Xg" id="(0.11764705882352941,0.3488372093023256)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_B2wfgeHeEd-yzYXzzLJ5Xg" id="(0.7941176470588235,0.3953488372093023)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Hj2vwOHfEd-yzYXzzLJ5Xg" type="3002" source="_gMAywMW7Ed-OHt4UvkWdIw" target="_jeN-UOHeEd-yzYXzzLJ5Xg">

-    <children xmi:type="notation:Node" xmi:id="_Hj394OHfEd-yzYXzzLJ5Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Hj394eHfEd-yzYXzzLJ5Xg" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Hj394uHfEd-yzYXzzLJ5Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Hj394-HfEd-yzYXzzLJ5Xg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Hj2vweHfEd-yzYXzzLJ5Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Hj2vwuHfEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/base"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Hj2vw-HfEd-yzYXzzLJ5Xg" points="[-3, -3, 263, 361]$[-264, -305, 2, 59]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hj7BMOHfEd-yzYXzzLJ5Xg" id="(0.17757009345794392,0.023255813953488372)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hj7BMeHfEd-yzYXzzLJ5Xg" id="(0.30666666666666664,0.11764705882352941)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_I-L_wOHfEd-yzYXzzLJ5Xg" type="3002" source="_gMAywMW7Ed-OHt4UvkWdIw" target="_jeN-UOHeEd-yzYXzzLJ5Xg">

-    <children xmi:type="notation:Node" xmi:id="_I-L_xOHfEd-yzYXzzLJ5Xg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_I-L_xeHfEd-yzYXzzLJ5Xg" x="-45" y="18"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_I-L_xuHfEd-yzYXzzLJ5Xg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_I-L_x-HfEd-yzYXzzLJ5Xg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_I-L_weHfEd-yzYXzzLJ5Xg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_I-L_wuHfEd-yzYXzzLJ5Xg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/target"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I-L_w-HfEd-yzYXzzLJ5Xg" points="[-6, -8, 287, 398]$[-291, -427, 2, -21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I-N08OHfEd-yzYXzzLJ5Xg" id="(0.38317757009345793,0.8837209302325582)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I-N08eHfEd-yzYXzzLJ5Xg" id="(0.66,0.058823529411764705)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_yIoMIOLBEd-_4rsUiqkbuA" type="3003" source="_e5kCMrX-Ed-Xj-3H8XK7WQ" target="_i0IhAMW6Ed-OHt4UvkWdIw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_yIoMIeLBEd-_4rsUiqkbuA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_yIoMIuLBEd-_4rsUiqkbuA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yIoMI-LBEd-_4rsUiqkbuA" points="[-20, 57, 162, -49]$[-80, 57, 102, -49]$[-80, 88, 102, -18]$[-149, 88, 33, -18]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yIr2gOLBEd-_4rsUiqkbuA" id="(0.10552763819095477,0.553921568627451)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yIr2geLBEd-_4rsUiqkbuA" id="(0.7591240875912408,0.5294117647058824)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_mSN3cOLEEd-_4rsUiqkbuA" type="3002" source="_xJ9a4LbDEd-HcNahxkfV5A" target="_i0IhAMW6Ed-OHt4UvkWdIw">

-    <children xmi:type="notation:Node" xmi:id="_mSOegOLEEd-_4rsUiqkbuA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_mSOegeLEEd-_4rsUiqkbuA" x="-35" y="18"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_mSOeguLEEd-_4rsUiqkbuA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_mSOeg-LEEd-_4rsUiqkbuA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_mSN3ceLEEd-_4rsUiqkbuA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_mSN3cuLEEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/addedComments"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mSN3c-LEEd-_4rsUiqkbuA" points="[-6, -4, 182, 132]$[-120, -122, 68, 14]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mSSv8OLEEd-_4rsUiqkbuA" id="(0.03773584905660377,0.5517241379310345)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qPEHgOLEEd-_4rsUiqkbuA" id="(0.927007299270073,0.7843137254901961)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="__2WYsOkJEd--FZQPkuXOdg" type="3002" source="_OTjUAekIEd--FZQPkuXOdg" target="_e5dUgrX-Ed-Xj-3H8XK7WQ">

-    <children xmi:type="notation:Node" xmi:id="__2gJsOkJEd--FZQPkuXOdg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="__2gJsekJEd--FZQPkuXOdg" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="__2gJsukJEd--FZQPkuXOdg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="__2gJs-kJEd--FZQPkuXOdg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="__2WYsekJEd--FZQPkuXOdg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="__2WYsukJEd--FZQPkuXOdg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapNameToReview/value"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__2WYs-kJEd--FZQPkuXOdg" points="[31, 25, -177, -139]$[209, 150, 1, -14]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__2gJtOkJEd--FZQPkuXOdg" id="(0.15053763440860216,0.045871559633027525)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_0c7XcOkLEd--FZQPkuXOdg" type="3002" source="_e5dUgrX-Ed-Xj-3H8XK7WQ" target="_ppNWMOkLEd--FZQPkuXOdg">

-    <children xmi:type="notation:Node" xmi:id="_0dEhYOkLEd--FZQPkuXOdg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0dEhYekLEd--FZQPkuXOdg" x="-29" y="1"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_0dEhYukLEd--FZQPkuXOdg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_0dEhY-kLEd--FZQPkuXOdg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0c7XcekLEd--FZQPkuXOdg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_0c7XcukLEd--FZQPkuXOdg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/usersMap"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0c7Xc-kLEd--FZQPkuXOdg" points="[-123, 131, 120, -128]$[-234, 250, 9, -9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0dEhZOkLEd--FZQPkuXOdg" id="(0.946236559139785,0.5474006116207951)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0dEhZekLEd--FZQPkuXOdg" id="(0.52,0.18604651162790697)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_8_XSkOkLEd--FZQPkuXOdg" type="3002" source="_ppNWMOkLEd--FZQPkuXOdg" target="_xJ9a4LbDEd-HcNahxkfV5A">

-    <children xmi:type="notation:Node" xmi:id="_8_XSlOkLEd--FZQPkuXOdg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8_XSlekLEd--FZQPkuXOdg" x="3" y="18"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_8_XSlukLEd--FZQPkuXOdg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8_XSl-kLEd--FZQPkuXOdg" x="-16" y="-2"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_8_XSkekLEd--FZQPkuXOdg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_8_XSkukLEd--FZQPkuXOdg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToUsers/value"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8_XSk-kLEd--FZQPkuXOdg" points="[-8, 9, 259, -279]$[-265, 321, 2, 33]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8_hDkOkLEd--FZQPkuXOdg" id="(0.344,0.8235294117647058)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8_hDkekLEd--FZQPkuXOdg" id="(0.5613207547169812,0.1839080459770115)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_A0LGUOkfEd--FZQPkuXOdg" type="3002" source="_xJ9a4LbDEd-HcNahxkfV5A" target="_NjunULqqEd-6aOwQ22t3_g">

-    <children xmi:type="notation:Node" xmi:id="_A0U3UOkfEd--FZQPkuXOdg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_A0U3UekfEd--FZQPkuXOdg" x="84" y="-50"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_A0U3UukfEd--FZQPkuXOdg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_A0U3U-kfEd--FZQPkuXOdg" x="120" y="-17"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_A0LGUekfEd--FZQPkuXOdg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_A0LGUukfEd--FZQPkuXOdg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/addedItems"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A0LGU-kfEd--FZQPkuXOdg" points="[49, -1, -775, 346]$[606, -9, -218, 338]$[798, -306, -26, 41]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A0U3VOkfEd--FZQPkuXOdg" id="(0.9634703196347032,0.3401360544217687)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A0U3VekfEd--FZQPkuXOdg" id="(0.033783783783783786,0.49411764705882355)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_chtOQOkoEd--FZQPkuXOdg" type="3002" source="_e5Wm0LX-Ed-Xj-3H8XK7WQ" target="_OTjUAekIEd--FZQPkuXOdg">

-    <children xmi:type="notation:Node" xmi:id="_chucYOkoEd--FZQPkuXOdg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_chucYekoEd--FZQPkuXOdg" x="-14" y="-12"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_chucYukoEd--FZQPkuXOdg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_chucY-koEd--FZQPkuXOdg" x="-14" y="7"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_chtOQekoEd--FZQPkuXOdg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_chtOQukoEd--FZQPkuXOdg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/reviewsMap"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_chtOQ-koEd--FZQPkuXOdg" points="[10, 3, -168, -48]$[179, 73, 1, 22]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_chyt0OkoEd--FZQPkuXOdg" id="(0.954337899543379,0.7205882352941176)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_chyt0ekoEd--FZQPkuXOdg" id="(0.10071942446043165,0.5686274509803921)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Wgw3sOmlEd-9SopSv7VwjA" type="3002" source="_Axg6QOknEd--FZQPkuXOdg" target="_OTjUAekIEd--FZQPkuXOdg">

-    <children xmi:type="notation:Node" xmi:id="_Wg2XQOmlEd-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Wg2XQemlEd-9SopSv7VwjA" x="-31" y="22"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Wg3lYOmlEd-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Wg3lYemlEd-9SopSv7VwjA" x="8" y="-12"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Wgw3semlEd-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Wgw3sumlEd-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews/invitedToMap"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wgw3s-mlEd-9SopSv7VwjA" points="[3, 25, -9, -70]$[14, 84, 2, -11]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vAJ-wOmlEd-9SopSv7VwjA" id="(0.6045197740112994,0.9411764705882353)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wg720OmlEd-9SopSv7VwjA" id="(0.7913669064748201,0.3137254901960784)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_HX-94OmpEd-9SopSv7VwjA" type="3003" source="_jr4t0OmoEd-9SopSv7VwjA" target="_0EcyQMW6Ed-OHt4UvkWdIw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_HX-94empEd-9SopSv7VwjA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_HX-94umpEd-9SopSv7VwjA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HX-94-mpEd-9SopSv7VwjA" points="[-4, -20, -3, 76]$[-85, -93, -84, 3]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IFeWAOmpEd-9SopSv7VwjA" id="(0.4838709677419355,0.11627906976744186)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_e1bfwOmpEd-9SopSv7VwjA" type="3003" source="_NjunULqqEd-6aOwQ22t3_g" target="_jr4t0OmoEd-9SopSv7VwjA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e1bfwempEd-9SopSv7VwjA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_e1bfwumpEd-9SopSv7VwjA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e1bfw-mpEd-9SopSv7VwjA" points="[-20, -3, 111, 20]$[-80, -3, 51, 20]$[-80, -11, 51, 12]$[-126, -11, 5, 12]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e1gYQOmpEd-9SopSv7VwjA" id="(0.14189189189189189,0.1411764705882353)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e1gYQempEd-9SopSv7VwjA" id="(0.9596774193548387,0.6046511627906976)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_w5YNYOmpEd-9SopSv7VwjA" type="3003" source="_PMT68MW8Ed-OHt4UvkWdIw" target="_jr4t0OmoEd-9SopSv7VwjA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_w5YNYempEd-9SopSv7VwjA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_w5YNYumpEd-9SopSv7VwjA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w5YNY-mpEd-9SopSv7VwjA" points="[8, -7, 301, 359]$[8, -355, 301, 11]$[-290, -355, 3, 11]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w5ce0OmpEd-9SopSv7VwjA" id="(0.6470588235294118,0.18604651162790697)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0k-8cOmpEd-9SopSv7VwjA" id="(0.9758064516129032,0.046511627906976744)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Nu8qgOmqEd-9SopSv7VwjA" type="3003" source="_i0IhAMW6Ed-OHt4UvkWdIw" target="_jr4t0OmoEd-9SopSv7VwjA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Nu8qgemqEd-9SopSv7VwjA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Nu8qgumqEd-9SopSv7VwjA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nu8qg-mqEd-9SopSv7VwjA" points="[68, 1, -911, 326]$[962, 1, -17, 326]$[962, -319, -17, 6]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Nu_GwOmqEd-9SopSv7VwjA" id="(0.5161290322580645,0.8604651162790697)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_nk2RgOmqEd-9SopSv7VwjA" type="3002" source="_jr4t0OmoEd-9SopSv7VwjA" target="_9EsdcLt3Ed-VvI-hm1I52A">

-    <children xmi:type="notation:Node" xmi:id="_nk24kOmqEd-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_nk24kemqEd-9SopSv7VwjA" x="145" y="9"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_nk24kumqEd-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_nk24k-mqEd-9SopSv7VwjA" x="176" y="16"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_nk2RgemqEd-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_nk2RgumqEd-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EIDComponent/id"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nk2Rg-mqEd-9SopSv7VwjA" points="[0, 10, 756, -578]$[-10, 353, 746, -235]$[-286, 588, 470, 0]$[-745, 588, 11, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nk6i8OmqEd-9SopSv7VwjA" id="(0.5806451612903226,0.7674418604651163)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nk6i8emqEd-9SopSv7VwjA" id="(0.916030534351145,0.6617647058823529)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EFvNMOmtEd-9SopSv7VwjA" type="3002" source="_i0IhAMW6Ed-OHt4UvkWdIw" target="_e5kCMrX-Ed-Xj-3H8XK7WQ">

-    <children xmi:type="notation:Node" xmi:id="_EFv0QOmtEd-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EFv0QemtEd-9SopSv7VwjA" x="-20" y="-1"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EFv0QumtEd-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EFv0Q-mtEd-9SopSv7VwjA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EFvNMemtEd-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EFvNMumtEd-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EComment/anomaly"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EFvNM-mtEd-9SopSv7VwjA" points="[17, -9, -189, 104]$[206, -112, 0, 1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EFzeoOmtEd-9SopSv7VwjA" id="(0.24817518248175183,0.0392156862745098)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EFzeoemtEd-9SopSv7VwjA" id="(0.05527638190954774,0.6225490196078431)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_sH5pIOmuEd-9SopSv7VwjA" type="3002" source="_WQ-ZIOmuEd-9SopSv7VwjA" target="_9EsdcLt3Ed-VvI-hm1I52A">

-    <children xmi:type="notation:Node" xmi:id="_sH6QMOmuEd-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_sH6QMemuEd-9SopSv7VwjA" x="-14" y="8"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_sH6QMumuEd-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_sH6QM-muEd-9SopSv7VwjA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_sH5pIemuEd-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_sH5pIumuEd-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapIDToComponent/key"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sH5pI-muEd-9SopSv7VwjA" points="[0, 8, 578, -311]$[0, 319, 578, 0]$[-565, 319, 13, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sH9TgOmuEd-9SopSv7VwjA" id="(0.13855421686746988,0.813953488372093)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sH9TgemuEd-9SopSv7VwjA" id="(0.9007633587786259,0.9705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_-yvXoOmuEd-9SopSv7VwjA" type="3002" source="_WQ-ZIOmuEd-9SopSv7VwjA" target="_jr4t0OmoEd-9SopSv7VwjA">

-    <children xmi:type="notation:Node" xmi:id="_-ywlwOmuEd-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_-ywlwemuEd-9SopSv7VwjA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_-ywlwumuEd-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_-ywlw-muEd-9SopSv7VwjA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_-yvXoemuEd-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_-yvXoumuEd-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapIDToComponent/value"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-yvXo-muEd-9SopSv7VwjA" points="[2, -8, -54, 253]$[57, -240, 1, 21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-y03MOmuEd-9SopSv7VwjA" id="(0.9156626506024096,0.3488372093023256)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-y03MemuEd-9SopSv7VwjA" id="(0.13709677419354838,0.4883720930232558)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_1i6mgOm4Ed-9SopSv7VwjA" type="3002" source="_e5dUgrX-Ed-Xj-3H8XK7WQ" target="_xJ9a4LbDEd-HcNahxkfV5A">

-    <children xmi:type="notation:Node" xmi:id="_1i70oOm4Ed-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1i70oem4Ed-9SopSv7VwjA" x="65" y="15"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1i70oum4Ed-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1i70o-m4Ed-9SopSv7VwjA" x="28" y="-6"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1i6mgem4Ed-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_1i6mgum4Ed-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/createdBy"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1i6mg-m4Ed-9SopSv7VwjA" points="[-4, 4, 405, -288]$[-268, 211, 141, -81]$[-393, 283, 16, -9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5soYOnYEd-9SopSv7VwjA" id="(0.026881720430107527,0.9283154121863799)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l5soYenYEd-9SopSv7VwjA" id="(0.41509433962264153,0.11494252873563218)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_RAIFkOnlEd-9SopSv7VwjA" type="3002" source="_Axg6QOknEd--FZQPkuXOdg" target="_e5Wm0LX-Ed-Xj-3H8XK7WQ">

-    <children xmi:type="notation:Node" xmi:id="_RAJ6wOnlEd-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RAJ6wenlEd-9SopSv7VwjA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_RAJ6wunlEd-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_RAJ6w-nlEd-9SopSv7VwjA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_RAIFkenlEd-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_RAIFkunlEd-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews/group"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RAIFk-nlEd-9SopSv7VwjA" points="[-8, 1, 180, -23]$[-186, -30, 2, -54]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RAOMMOnlEd-9SopSv7VwjA" id="(0.11864406779661017,0.803921568627451)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RAOMMenlEd-9SopSv7VwjA" id="(0.9406392694063926,0.40441176470588236)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_3-9u8Op4Ed-9SopSv7VwjA" type="3002" source="_K_3pgOp4Ed-9SopSv7VwjA" target="_Axg6QOknEd--FZQPkuXOdg">

-    <children xmi:type="notation:Node" xmi:id="_3--WAOp4Ed-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3--WAep4Ed-9SopSv7VwjA" x="-9" y="-25"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_3--9EOp4Ed-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3--9Eep4Ed-9SopSv7VwjA" x="-5" y="16"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3-9u8ep4Ed-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_3-9u8up4Ed-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapUserIDToUserReviews/value"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3-9u8-p4Ed-9SopSv7VwjA" points="[2, 25, 2, -82]$[2, 96, 2, -11]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3_CAYOp4Ed-9SopSv7VwjA" id="(0.5649717514124294,0.23529411764705882)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_6qzqIOp4Ed-9SopSv7VwjA" type="3002" source="_e5Wm0LX-Ed-Xj-3H8XK7WQ" target="_K_3pgOp4Ed-9SopSv7VwjA">

-    <children xmi:type="notation:Node" xmi:id="_6q0RMOp4Ed-9SopSv7VwjA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6q0RMep4Ed-9SopSv7VwjA" x="-41" y="-24"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_6q0RMup4Ed-9SopSv7VwjA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6q0RM-p4Ed-9SopSv7VwjA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6qzqIep4Ed-9SopSv7VwjA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_6qzqIup4Ed-9SopSv7VwjA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/userReviews"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6qzqI-p4Ed-9SopSv7VwjA" points="[13, -4, -177, 60]$[191, -83, 1, -19]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6q2GYOp4Ed-9SopSv7VwjA" id="(0.9406392694063926,0.2647058823529412)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6q2GYep4Ed-9SopSv7VwjA" id="(0.06285714285714286,0.39215686274509803)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_-KQm8OtREd--H94fXRIifg" type="3002" source="_e5dUgrX-Ed-Xj-3H8XK7WQ" target="_WQ-ZIOmuEd-9SopSv7VwjA">

-    <children xmi:type="notation:Node" xmi:id="_-KScIOtREd--H94fXRIifg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_-KScIetREd--H94fXRIifg" x="-6" y="-6"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_-KScIutREd--H94fXRIifg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_-KScI-tREd--H94fXRIifg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_-KQm8etREd--H94fXRIifg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_-KQm8utREd--H94fXRIifg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/idsMap"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-KQm8-tREd--H94fXRIifg" points="[8, 38, -35, -175]$[44, 222, 1, 9]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-KWtkOtREd--H94fXRIifg" id="(0.7043010752688172,0.8637992831541219)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-KWtketREd--H94fXRIifg" id="(0.39156626506024095,0.7906976744186046)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_30b9QOtlEd--H94fXRIifg" type="3002" source="_xJ9a4LbDEd-HcNahxkfV5A" target="_e5dUgrX-Ed-Xj-3H8XK7WQ">

-    <children xmi:type="notation:Node" xmi:id="_30ckUOtlEd--H94fXRIifg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_30ckUetlEd--H94fXRIifg" x="-4" y="-13"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_30ckUutlEd--H94fXRIifg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_30ckU-tlEd--H94fXRIifg" x="43" y="9"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_30b9QetlEd--H94fXRIifg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_30b9QutlEd--H94fXRIifg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/reviewInstance"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_30b9Q-tlEd--H94fXRIifg" points="[14, -6, -469, 319]$[179, -90, -304, 235]$[467, -312, -16, 13]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_30fnoOtlEd--H94fXRIifg" id="(0.0365296803652968,0.006802721088435374)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_30fnoetlEd--H94fXRIifg" id="(0.0913978494623656,0.7992831541218638)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_qlz7IPP9Ed-0svOvi6MM0A" type="3002" source="_ruqP4PfqEd-WaLZjXTHHFA" target="_jeN-UOHeEd-yzYXzzLJ5Xg">

-    <children xmi:type="notation:Node" xmi:id="_qlz7JPP9Ed-0svOvi6MM0A" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_qlz7JfP9Ed-0svOvi6MM0A" x="19" y="-28"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_qlz7JvP9Ed-0svOvi6MM0A" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_qlz7J_P9Ed-0svOvi6MM0A" x="-1" y="-13"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_qlz7IfP9Ed-0svOvi6MM0A" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_qlz7IvP9Ed-0svOvi6MM0A" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyTextPosition/file"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qlz7I_P9Ed-0svOvi6MM0A" points="[9, -6, -179, 134]$[112, -90, -76, 50]$[137, -107, -51, 33]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qlz7KPP9Ed-0svOvi6MM0A" id="(0.6162790697674418,0.1320754716981132)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qlz7KfP9Ed-0svOvi6MM0A" id="(0.0449438202247191,0.6797385620915033)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_6vApoPfqEd-WaLZjXTHHFA" type="3003" source="_ruqP4PfqEd-WaLZjXTHHFA" target="_e5vBVLX-Ed-Xj-3H8XK7WQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6vBQsPfqEd-WaLZjXTHHFA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_6vBQsffqEd-WaLZjXTHHFA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6vBQsvfqEd-WaLZjXTHHFA" points="[26, 0, -67, 1]$[94, -29, 1, -28]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6vE7EPfqEd-WaLZjXTHHFA" id="(0.8488372093023255,0.5849056603773585)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6vE7EffqEd-WaLZjXTHHFA" id="(0.07352941176470588,0.28431372549019607)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_39uhoC5MEeCiNYXZ8-OQ4Q" type="3003" source="_gMAywMW7Ed-OHt4UvkWdIw" target="_jr4t0OmoEd-9SopSv7VwjA">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_39uhoS5MEeCiNYXZ8-OQ4Q" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_39uhoi5MEeCiNYXZ8-OQ4Q" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_39uhoy5MEeCiNYXZ8-OQ4Q" points="[131, -3, 338, 245]$[140, -3, 347, 245]$[140, -244, 347, 4]$[-146, -244, 61, 4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_39uhpC5MEeCiNYXZ8-OQ4Q" id="(0.17757009345794392,0.5813953488372093)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_uNgp8EQzEeCXbIx_qEv2wA" type="3003" source="_xJ9a4LbDEd-HcNahxkfV5A" target="_0EcyQMW6Ed-OHt4UvkWdIw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_uNgp8UQzEeCXbIx_qEv2wA" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_uNgp8kQzEeCXbIx_qEv2wA" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uNgp80QzEeCXbIx_qEv2wA" points="[14, 6, -508, 448]$[361, 6, -161, 448]$[361, -166, -161, 276]$[517, -166, -5, 276]$[517, -437, -5, 5]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uNkUUEQzEeCXbIx_qEv2wA" id="(0.9360730593607306,0.07482993197278912)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7-hiwEQzEeCXbIx_qEv2wA" id="(0.10526315789473684,0.8837209302325582)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FFqUIEQ5EeCXbIx_qEv2wA" type="3002" source="_UghugLeCEd-lI8UEEXo2gw" target="_PZB20EQ4EeCXbIx_qEv2wA">

-    <children xmi:type="notation:Node" xmi:id="_FFriQEQ5EeCXbIx_qEv2wA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FFriQUQ5EeCXbIx_qEv2wA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FFriQkQ5EeCXbIx_qEv2wA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FFriQ0Q5EeCXbIx_qEv2wA" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FFqUIUQ5EeCXbIx_qEv2wA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FFqUIkQ5EeCXbIx_qEv2wA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/timeLog"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FFqUI0Q5EeCXbIx_qEv2wA" points="[-5, 0, 445, 25]$[-413, 0, 37, 25]$[-444, -21, 6, 4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FFulkEQ5EeCXbIx_qEv2wA" id="(0.028985507246376812,0.8211382113821138)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FFvMoEQ5EeCXbIx_qEv2wA" id="(0.31788079470198677,0.9411764705882353)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_1ddI0EQ7EeCXbIx_qEv2wA" type="3002" source="_NjunULqqEd-6aOwQ22t3_g" target="_N2lFQEQ7EeCXbIx_qEv2wA">

-    <children xmi:type="notation:Node" xmi:id="_1deW8EQ7EeCXbIx_qEv2wA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1deW8UQ7EeCXbIx_qEv2wA" x="44" y="-35"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1deW8kQ7EeCXbIx_qEv2wA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1deW80Q7EeCXbIx_qEv2wA" x="15" y="-16"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1ddI0UQ7EeCXbIx_qEv2wA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_1ddI0kQ7EeCXbIx_qEv2wA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/infoAtt"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1ddI00Q7EeCXbIx_qEv2wA" points="[16, 1, -111, -6]$[128, -14, 1, -21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1dhaQEQ7EeCXbIx_qEv2wA" id="(0.9012345679012346,0.09803921568627451)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1diBUEQ7EeCXbIx_qEv2wA" id="(0.1871345029239766,0.3235294117647059)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EOQDoEQ8EeCXbIx_qEv2wA" type="3002" source="_gMAywMW7Ed-OHt4UvkWdIw" target="_N2lFQEQ7EeCXbIx_qEv2wA">

-    <children xmi:type="notation:Node" xmi:id="_EOQqsEQ8EeCXbIx_qEv2wA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EOQqsUQ8EeCXbIx_qEv2wA" x="-3" y="-17"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EORRwEQ8EeCXbIx_qEv2wA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EORRwUQ8EeCXbIx_qEv2wA" x="-7" y="7"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EOQDoUQ8EeCXbIx_qEv2wA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EOQDokQ8EeCXbIx_qEv2wA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/infoAtt"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EOQDo0Q8EeCXbIx_qEv2wA" points="[2, -1, -108, 79]$[105, -75, -5, 5]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EOUVEEQ8EeCXbIx_qEv2wA" id="(0.8509316770186336,0.0392156862745098)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EOUVEUQ8EeCXbIx_qEv2wA" id="(0.03508771929824561,0.6323529411764706)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_QAxPcEQ8EeCXbIx_qEv2wA" type="3002" source="_jeN-UOHeEd-yzYXzzLJ5Xg" target="_N2lFQEQ7EeCXbIx_qEv2wA">

-    <children xmi:type="notation:Node" xmi:id="_QAxPdEQ8EeCXbIx_qEv2wA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QAxPdUQ8EeCXbIx_qEv2wA" x="-2" y="-12"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_QAxPdkQ8EeCXbIx_qEv2wA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QAxPd0Q8EeCXbIx_qEv2wA" x="29" y="25"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_QAxPcUQ8EeCXbIx_qEv2wA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_QAxPckQ8EeCXbIx_qEv2wA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/infoAtt"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QAxPc0Q8EeCXbIx_qEv2wA" points="[21, -11, -221, 179]$[169, -95, -73, 95]$[238, -185, -4, 5]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QAxPeEQ8EeCXbIx_qEv2wA" id="(0.8820224719101124,0.0784313725490196)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QAxPeUQ8EeCXbIx_qEv2wA" id="(0.2222222222222222,0.9264705882352942)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_oGGTUEskEeCkEvu0hBjtTg" type="3002" source="_e5phwLX-Ed-Xj-3H8XK7WQ" target="_NSQS0UsjEeCkEvu0hBjtTg">

-    <children xmi:type="notation:Node" xmi:id="_oGHhcEskEeCkEvu0hBjtTg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oGHhcUskEeCkEvu0hBjtTg" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oGHhckskEeCkEvu0hBjtTg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_oGHhc0skEeCkEvu0hBjtTg" y="8"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_oGGTUUskEeCkEvu0hBjtTg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_oGGTUkskEeCkEvu0hBjtTg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFormalReview/phases"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oGGTU0skEeCkEvu0hBjtTg" points="[24, 3, -106, 0]$[71, 3, -59, 0]$[119, 3, -11, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oGLy4EskEeCkEvu0hBjtTg" id="(0.9855072463768116,0.3783783783783784)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oGLy4UskEeCkEvu0hBjtTg" id="(0.03954802259887006,0.3220338983050847)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xXDhUEskEeCkEvu0hBjtTg" type="3002" source="_e5phwLX-Ed-Xj-3H8XK7WQ" target="_NSQS0UsjEeCkEvu0hBjtTg">

-    <children xmi:type="notation:Node" xmi:id="_xXEvcEskEeCkEvu0hBjtTg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xXEvcUskEeCkEvu0hBjtTg" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_xXFWgEskEeCkEvu0hBjtTg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xXFWgUskEeCkEvu0hBjtTg" y="13"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xXDhUUskEeCkEvu0hBjtTg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xXDhUkskEeCkEvu0hBjtTg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFormalReview/current"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xXDhU0skEeCkEvu0hBjtTg" points="[10, 3, -102, 0]$[57, 3, -55, 0]$[105, 3, -7, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xXJn8EskEeCkEvu0hBjtTg" id="(0.9710144927536232,0.7027027027027027)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xXJn8UskEeCkEvu0hBjtTg" id="(0.05084745762711865,0.6779661016949152)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_8bhI8GFMEeCFVY01TT49FA" type="3002" source="_e5dUgrX-Ed-Xj-3H8XK7WQ" target="_EnkEsGFKEeCFVY01TT49FA">

-    <children xmi:type="notation:Node" xmi:id="_8biXEGFMEeCFVY01TT49FA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8biXEWFMEeCFVY01TT49FA" x="24" y="-36"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_8bjlMGFMEeCFVY01TT49FA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_8bjlMWFMEeCFVY01TT49FA" x="-17" y="14"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_8bhI8WFMEeCFVY01TT49FA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_8bhI8mFMEeCFVY01TT49FA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/activeMeeting"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8bhI82FMEeCFVY01TT49FA" points="[-7, -6, 64, 58]$[-69, -53, 2, 11]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8bnPkGFMEeCFVY01TT49FA" id="(0.15053763440860216,0.025089605734767026)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8bnPkWFMEeCFVY01TT49FA" id="(0.551948051948052,0.935672514619883)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ImAQIKjbEeC_EZPd3m9Ykg" type="3002" source="_i0IhAMW6Ed-OHt4UvkWdIw" target="_N2lFQEQ7EeCXbIx_qEv2wA">

-    <children xmi:type="notation:Node" xmi:id="_ImBeQKjbEeC_EZPd3m9Ykg" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ImBeQajbEeC_EZPd3m9Ykg" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ImBeQqjbEeC_EZPd3m9Ykg" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ImBeQ6jbEeC_EZPd3m9Ykg" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ImAQIajbEeC_EZPd3m9Ykg" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ImAQIqjbEeC_EZPd3m9Ykg" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EComment/infoAtt"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ImAQI6jbEeC_EZPd3m9Ykg" points="[5, 0, -1481, 155]$[1478, 0, -8, 155]$[1478, -153, -8, 2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ImFvsKjbEeC_EZPd3m9Ykg" id="(0.9635036496350365,0.0784313725490196)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ImFvsajbEeC_EZPd3m9Ykg" id="(0.9005847953216374,0.9705882352941176)"/>

-  </edges>

-</notation:Diagram>

diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.design.rules.ecorediag b/org.eclipse.mylyn.reviews.r4e.core/model/r4e.design.rules.ecorediag
deleted file mode 100644
index b6a892cd..00000000
--- a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.design.rules.ecorediag
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_1POjIOLhEd-_4rsUiqkbuA" type="EcoreTools" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_1PisMOLhEd-_4rsUiqkbuA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_1PjTQOLhEd-_4rsUiqkbuA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_1PjTQeLhEd-_4rsUiqkbuA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_1Pj6VOLhEd-_4rsUiqkbuA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRuleCollection/version"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1Pj6VeLhEd-_4rsUiqkbuA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_hfI4sF70EeC7YYx9yY610w" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRuleCollection/folder"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hfI4sV70EeC7YYx9yY610w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_ned94F70EeC7YYx9yY610w" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRuleCollection/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ned94V70EeC7YYx9yY610w"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1PjTQuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1PjTQ-LhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1PjTROLhEd-_4rsUiqkbuA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1Pj6UOLhEd-_4rsUiqkbuA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1Pj6UeLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1Pj6UuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1Pj6U-LhEd-_4rsUiqkbuA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_1PisMeLhEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="r4e.design.rules.ecore#//R4EDesignRuleCollection"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PisMuLhEd-_4rsUiqkbuA" x="1" y="401"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_1PkhYuLhEd-_4rsUiqkbuA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_1PnksOLhEd-_4rsUiqkbuA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_1PnkseLhEd-_4rsUiqkbuA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_1PoLwOLhEd-_4rsUiqkbuA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRule/id"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PoLweLhEd-_4rsUiqkbuA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_1PoLwuLhEd-_4rsUiqkbuA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRule/rank"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PoLw-LhEd-_4rsUiqkbuA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_1PpZ4OLhEd-_4rsUiqkbuA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRule/class"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PpZ4eLhEd-_4rsUiqkbuA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_1PpZ4uLhEd-_4rsUiqkbuA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRule/title"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PpZ4-LhEd-_4rsUiqkbuA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_1PpZ5OLhEd-_4rsUiqkbuA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRule/description"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PpZ5eLhEd-_4rsUiqkbuA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1PnksuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1Pnks-LhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1PnktOLhEd-_4rsUiqkbuA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1PnkteLhEd-_4rsUiqkbuA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1PnktuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1Pnkt-LhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1PnkuOLhEd-_4rsUiqkbuA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_1PkhY-LhEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="r4e.design.rules.ecore#//R4EDesignRule"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PkhZOLhEd-_4rsUiqkbuA"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_1PqA8OLhEd-_4rsUiqkbuA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_1PqoAOLhEd-_4rsUiqkbuA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_1PqoAeLhEd-_4rsUiqkbuA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_1PqoCeLhEd-_4rsUiqkbuA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRuleArea/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PqoCuLhEd-_4rsUiqkbuA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1PqoAuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1PqoA-LhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1PqoBOLhEd-_4rsUiqkbuA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1PqoBeLhEd-_4rsUiqkbuA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1PqoBuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1PqoB-LhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1PqoCOLhEd-_4rsUiqkbuA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_1PqA8eLhEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="r4e.design.rules.ecore#//R4EDesignRuleArea"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PqA8uLhEd-_4rsUiqkbuA" x="27" y="288" height="53"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_1PrPEOLhEd-_4rsUiqkbuA" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_1PrPE-LhEd-_4rsUiqkbuA" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_1PrPFOLhEd-_4rsUiqkbuA" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_1Pr2JOLhEd-_4rsUiqkbuA" type="2001">

-        <element xmi:type="ecore:EAttribute" href="r4e.design.rules.ecore#//R4EDesignRuleViolation/name"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1Pr2JeLhEd-_4rsUiqkbuA"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1PrPFeLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1PrPFuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1PrPF-LhEd-_4rsUiqkbuA"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1Pr2IOLhEd-_4rsUiqkbuA" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1Pr2IeLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1Pr2IuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1Pr2I-LhEd-_4rsUiqkbuA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_1PrPEeLhEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="r4e.design.rules.ecore#//R4EDesignRuleViolation"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PrPEuLhEd-_4rsUiqkbuA" y="180"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_1PsdMOLhEd-_4rsUiqkbuA" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_1PsdM-LhEd-_4rsUiqkbuA" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_1PsdNOLhEd-_4rsUiqkbuA" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_1PtEQOLhEd-_4rsUiqkbuA" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleRank/R4E_RANK_NONE"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PtEQeLhEd-_4rsUiqkbuA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_1PtEQuLhEd-_4rsUiqkbuA" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleRank/R4E_RANK_MINOR"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PtEQ-LhEd-_4rsUiqkbuA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_1PtEROLhEd-_4rsUiqkbuA" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleRank/R4E_RANK_MAJOR"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1PtEReLhEd-_4rsUiqkbuA"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_7yEnwEFCEeGABOEnWGwrcQ" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleRank/R4E_RANK_DEPRECATED"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7yEnwUFCEeGABOEnWGwrcQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1PsdNeLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_1PsdNuLhEd-_4rsUiqkbuA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1PsdN-LhEd-_4rsUiqkbuA"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_1PsdMeLhEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="r4e.design.rules.ecore#//R4EDesignRuleRank"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1PsdMuLhEd-_4rsUiqkbuA" x="228" y="12"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_vg0DsF70EeC7YYx9yY610w" type="1005">

-    <children xmi:type="notation:Node" xmi:id="_vg144F70EeC7YYx9yY610w" type="4010"/>

-    <children xmi:type="notation:Node" xmi:id="_vg3HAF70EeC7YYx9yY610w" type="5008">

-      <children xmi:type="notation:Node" xmi:id="_2vyL0F70EeC7YYx9yY610w" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_ERRONEOUS"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2vyL0V70EeC7YYx9yY610w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_5NjOwF70EeC7YYx9yY610w" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_SUPERFLUOUS"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5NjOwV70EeC7YYx9yY610w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_9GnLAF70EeC7YYx9yY610w" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_IMPROVEMENT"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_9GnLAV70EeC7YYx9yY610w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_G8GpcF71EeC7YYx9yY610w" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_QUESTION"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_G8GpcV71EeC7YYx9yY610w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_4vG7QKsoEeG8sODmDqdtUQ" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_COMMENT"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4vG7QasoEeG8sODmDqdtUQ"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_XfklgMYJEeGlnKonMkrXaw" type="2006">

-        <element xmi:type="ecore:EEnumLiteral" href="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_MISSING"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XfklgcYJEeGlnKonMkrXaw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_vg3HAV70EeC7YYx9yY610w"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_vg3HAl70EeC7YYx9yY610w"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vg3HA170EeC7YYx9yY610w"/>

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_vg0DsV70EeC7YYx9yY610w" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EEnum" href="r4e.design.rules.ecore#//R4EDesignRuleClass"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vg0Dsl70EeC7YYx9yY610w" x="444" y="12"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_1POjIeLhEd-_4rsUiqkbuA"/>

-  <element xmi:type="ecore:EPackage" href="r4e.design.rules.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_1PtrUOLhEd-_4rsUiqkbuA" type="3002" source="_1PisMOLhEd-_4rsUiqkbuA" target="_1PqA8OLhEd-_4rsUiqkbuA">

-    <children xmi:type="notation:Node" xmi:id="_1PtrVOLhEd-_4rsUiqkbuA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1PtrVeLhEd-_4rsUiqkbuA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1PtrVuLhEd-_4rsUiqkbuA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1PtrV-LhEd-_4rsUiqkbuA" x="-8" y="22"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1PtrUeLhEd-_4rsUiqkbuA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_1PtrUuLhEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="r4e.design.rules.ecore#//R4EDesignRuleCollection/areas"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1PtrU-LhEd-_4rsUiqkbuA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Qtw4OLhEd-_4rsUiqkbuA" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Qtw4eLhEd-_4rsUiqkbuA" id="(0.4,0.8113207547169812)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_1PuSYOLhEd-_4rsUiqkbuA" type="3002" source="_1PqA8OLhEd-_4rsUiqkbuA" target="_1PrPEOLhEd-_4rsUiqkbuA">

-    <children xmi:type="notation:Node" xmi:id="_1PuSZOLhEd-_4rsUiqkbuA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1PuSZeLhEd-_4rsUiqkbuA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1PuSZuLhEd-_4rsUiqkbuA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1PuSZ-LhEd-_4rsUiqkbuA" x="1" y="34"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1PuSYeLhEd-_4rsUiqkbuA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_1PuSYuLhEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="r4e.design.rules.ecore#//R4EDesignRuleArea/violations"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1PuSY-LhEd-_4rsUiqkbuA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1QtJ0OLhEd-_4rsUiqkbuA" id="(0.4074074074074074,0.11320754716981132)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1QtJ0eLhEd-_4rsUiqkbuA" id="(0.4956521739130435,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_1PuSaOLhEd-_4rsUiqkbuA" type="3002" source="_1PrPEOLhEd-_4rsUiqkbuA" target="_1PkhYuLhEd-_4rsUiqkbuA">

-    <children xmi:type="notation:Node" xmi:id="_1Pu5cOLhEd-_4rsUiqkbuA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Pu5ceLhEd-_4rsUiqkbuA" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_1Pu5cuLhEd-_4rsUiqkbuA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1Pu5c-LhEd-_4rsUiqkbuA" x="-2" y="34"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1PuSaeLhEd-_4rsUiqkbuA" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_1PuSauLhEd-_4rsUiqkbuA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="r4e.design.rules.ecore#//R4EDesignRuleViolation/rules"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1PuSa-LhEd-_4rsUiqkbuA" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1QuX8OLhEd-_4rsUiqkbuA" id="(0.51875,0.13725490196078433)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1QuX8eLhEd-_4rsUiqkbuA" id="(0.4371584699453552,0.9663865546218487)"/>

-  </edges>

-</notation:Diagram>

diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.drules.genmodel b/org.eclipse.mylyn.reviews.r4e.core/model/r4e.drules.genmodel
deleted file mode 100644
index db76f392..00000000
--- a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.drules.genmodel
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010 Ericsson&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials are&#xD;&#xA;made available under the terms of the Eclipse Public License v1.0 which&#xD;&#xA;accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Description:&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Alvaro Sanchez-Leon - Initial API and implementation&#xD;&#xA;"

-    modelDirectory="/org.eclipse.mylyn.reviews.r4e.core/src" modelPluginID="org.eclipse.mylyn.reviews.r4e.core"

-    modelName="R4e" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"

-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.mylyn.reviews.frame.core/model/framework.genmodel#//model"

-    classNamePattern="">

-  <foreignModel>r4e.design.rules.ecore</foreignModel>

-  <genPackages prefix="DRModel" basePackage="org.eclipse.mylyn.reviews.r4e.core.model"

-      disposableProviderFactory="true" ecorePackage="r4e.design.rules.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="r4e.design.rules.ecore#//R4EDesignRuleRank">

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleRank/R4E_RANK_NONE"/>

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleRank/R4E_RANK_MINOR"/>

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleRank/R4E_RANK_MAJOR"/>

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleRank/R4E_RANK_DEPRECATED"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="r4e.design.rules.ecore#//R4EDesignRuleClass">

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_ERRONEOUS"/>

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_SUPERFLUOUS"/>

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_IMPROVEMENT"/>

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_QUESTION"/>

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_COMMENT"/>

-      <genEnumLiterals ecoreEnumLiteral="r4e.design.rules.ecore#//R4EDesignRuleClass/R4E_CLASS_MISSING"/>

-    </genEnums>

-    <genClasses ecoreClass="r4e.design.rules.ecore#//R4EDesignRuleCollection">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.design.rules.ecore#//R4EDesignRuleCollection/areas"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRuleCollection/version"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRuleCollection/folder"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRuleCollection/name"/>

-    </genClasses>

-    <genClasses ecoreClass="r4e.design.rules.ecore#//R4EDesignRule">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRule/id"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRule/rank"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRule/class"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRule/title"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRule/description"/>

-    </genClasses>

-    <genClasses ecoreClass="r4e.design.rules.ecore#//R4EDesignRuleArea">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.design.rules.ecore#//R4EDesignRuleArea/violations"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRuleArea/name"/>

-    </genClasses>

-    <genClasses ecoreClass="r4e.design.rules.ecore#//R4EDesignRuleViolation">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.design.rules.ecore#//R4EDesignRuleViolation/rules"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.design.rules.ecore#//R4EDesignRuleViolation/name"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/org.eclipse.mylyn.reviews.r4e.core.model.ecore b/org.eclipse.mylyn.reviews.r4e.core/model/r4e.ecore
index 1bd44faa..2cef42b3 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/model/org.eclipse.mylyn.reviews.r4e.core.model.ecore
+++ b/org.eclipse.mylyn.reviews.r4e.core/model/r4e.ecore
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
-    nsURI="http://org.eclipse.mylyn.reviews.r4e.core.model/" nsPrefix="r4ecore">
-  <eClassifiers xsi:type="ecore:EClass" name="R4EReviewGroup" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewGroup #//R4EReviewComponent">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://org.eclipse.mylyn.reviews.r4e.core.model/"
+    nsPrefix="r4ecore">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EReviewGroup" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ReviewGroup #//R4EReviewComponent platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ModelVersioning">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="R4EReviewGroup"/>
     </eAnnotations>
@@ -27,7 +26,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="userReviews" upperBound="-1"
         eType="#//MapUserIDToUserReviews" transient="true" derived="true" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EReview" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//Review #//R4EReviewComponent">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EReview" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//Review #//R4EReviewComponent platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ModelVersioning">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="project" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="components" upperBound="-1"
@@ -41,6 +40,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="startDate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="endDate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dueDate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modifiedDate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="anomalyTemplate" lowerBound="1"
         eType="#//R4EAnomaly" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//R4EReviewType"
@@ -54,11 +54,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="activeMeeting" eType="#//R4EMeetingData"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EAnomaly" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//Topic #//R4EReviewComponent #//R4EComment">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EAnomaly" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//Topic #//R4EReviewComponent #//R4EComment">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="state" eType="#//R4EAnomalyState"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dueDate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rank" eType="ecore:EEnum r4e.design.rules.ecore#//R4EDesignRuleRank"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rule" eType="ecore:EClass r4e.design.rules.ecore#//R4EDesignRule"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rank" eType="ecore:EEnum drules.ecore#//R4EDesignRuleRank"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="rule" eType="ecore:EClass drules.ecore#//R4EDesignRule"
         transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="notAcceptedReason" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isImported" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -69,14 +69,14 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="followUpByID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="R4EAnomalyState">
-    <eLiterals name="R4E_ANOMALY_STATE_CREATED" value="5"/>
-    <eLiterals name="R4E_ANOMALY_STATE_ASSIGNED" value="4"/>
-    <eLiterals name="R4E_ANOMALY_STATE_ACCEPTED"/>
-    <eLiterals name="R4E_ANOMALY_STATE_FIXED" value="7"/>
-    <eLiterals name="R4E_ANOMALY_STATE_DUPLICATED" value="1"/>
-    <eLiterals name="R4E_ANOMALY_STATE_REJECTED" value="2"/>
-    <eLiterals name="R4E_ANOMALY_STATE_DEFERRED" value="3" literal="R4E_ANOMALY_STATE_DEFERRED"/>
-    <eLiterals name="R4E_ANOMALY_STATE_VERIFIED" value="6"/>
+    <eLiterals name="Created" value="5" literal="CREATED"/>
+    <eLiterals name="Assigned" value="4" literal="ASSIGNED"/>
+    <eLiterals name="Accepted" literal="ACCEPTED"/>
+    <eLiterals name="Fixed" value="7" literal="FIXED"/>
+    <eLiterals name="Duplicated" value="1" literal="DUPLICATED"/>
+    <eLiterals name="Rejected" value="2" literal="REJECTED"/>
+    <eLiterals name="Deferred" value="3" literal="DEFERRED"/>
+    <eLiterals name="Verified" value="6" literal="VERIFIED"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="R4EFormalReview" eSuperTypes="#//R4EReview">
     <eStructuralFeatures xsi:type="ecore:EReference" name="phaseOwner" lowerBound="1"
@@ -86,11 +86,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="current" eType="#//R4EReviewPhaseInfo"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="R4EReviewPhase">
-    <eLiterals name="R4E_REVIEW_PHASE_STARTED"/>
-    <eLiterals name="R4E_REVIEW_PHASE_PREPARATION" value="1"/>
-    <eLiterals name="R4E_REVIEW_PHASE_DECISION" value="2" literal="R4E_REVIEW_PHASE_DECISION"/>
-    <eLiterals name="R4E_REVIEW_PHASE_REWORK" value="3"/>
-    <eLiterals name="R4E_REVIEW_PHASE_COMPLETED" value="4"/>
+    <eLiterals name="Started" literal="STARTED"/>
+    <eLiterals name="Preparation" value="1" literal="PREPARATION"/>
+    <eLiterals name="Decision" value="2" literal="DECISION"/>
+    <eLiterals name="Rework" value="3" literal="REWORK"/>
+    <eLiterals name="Completed" value="4" literal="COMPLETED"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="R4ETextPosition" eSuperTypes="#//R4EPosition">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="startPosition" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
@@ -99,22 +99,22 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="endLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="R4EUserRole">
-    <eLiterals name="R4E_ROLE_REVIEWER"/>
-    <eLiterals name="R4E_ROLE_LEAD" value="1"/>
-    <eLiterals name="R4E_ROLE_AUTHOR" value="2"/>
-    <eLiterals name="R4E_ROLE_ORGANIZER" value="3"/>
+    <eLiterals name="Reviewer" literal="REVIEWER"/>
+    <eLiterals name="Lead" value="1" literal="LEAD"/>
+    <eLiterals name="Author" value="2" literal="AUTHOR"/>
+    <eLiterals name="Organizer" value="3" literal="ORGANIZER"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="R4EReviewDecision">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="spentTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//R4EDecision"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="R4EDecision">
-    <eLiterals name="R4E_REVIEW_DECISION_NONE"/>
-    <eLiterals name="R4E_REVIEW_DECISION_ACCEPTED" value="1"/>
-    <eLiterals name="R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP" value="2"/>
-    <eLiterals name="R4E_REVIEW_DECISION_REJECTED" value="3"/>
+    <eLiterals name="None" literal="NONE"/>
+    <eLiterals name="Accepted" value="1" literal="ACCEPTED"/>
+    <eLiterals name="AcceptedFollowup" value="2" literal="FOLLOWUP"/>
+    <eLiterals name="Rejected" value="3" literal="REJECTED"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EUser" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//User #//R4EReviewComponent">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EUser" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//User #//R4EReviewComponent">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="groupPaths" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" transient="true"
         derived="true"/>
@@ -139,7 +139,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="timeLog" upperBound="-1"
         eType="#//MapDateToDuration" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EItem" eSuperTypes="#//R4EIDComponent ../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//Item">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EItem" eSuperTypes="#//R4EIDComponent platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ReviewItem">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="addedById" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="fileContextList" upperBound="-1"
@@ -160,25 +160,25 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="userID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="R4EReviewType">
-    <eLiterals name="R4E_REVIEW_TYPE_BASIC"/>
-    <eLiterals name="R4E_REVIEW_TYPE_INFORMAL" value="1"/>
-    <eLiterals name="R4E_REVIEW_TYPE_FORMAL" value="2"/>
+    <eLiterals name="Basic" literal="BASIC"/>
+    <eLiterals name="Informal" value="1" literal="INFORMAL"/>
+    <eLiterals name="Formal" value="2" literal="FORMAL"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EAnomalyType" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//CommentType">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EAnomalyType" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//CommentType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4ETaskReference" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//TaskReference #//R4EReviewComponent"/>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EReviewState" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewState">
+  <eClassifiers xsi:type="ecore:EClass" name="R4ETaskReference" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//TaskReference #//R4EReviewComponent"/>
+  <eClassifiers xsi:type="ecore:EClass" name="R4EReviewState" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ReviewState">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="state" eType="#//R4EReviewPhase"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EComment" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//Comment #//R4EReviewComponent #//R4EIDComponent">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EComment" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//Comment #//R4EReviewComponent #//R4EIDComponent">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="createdOn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="anomaly" lowerBound="1"
         eType="#//R4EAnomaly"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="infoAtt" upperBound="-1"
         eType="#//MapKeyToInfoAttributes" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EReviewComponent" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//ReviewComponent">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EReviewComponent" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//ReviewComponent">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="assignedTo" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
@@ -199,14 +199,14 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
         eType="#//R4EContent" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4ECommentType" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//CommentType">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EEnum r4e.design.rules.ecore#//R4EDesignRuleClass"/>
+  <eClassifiers xsi:type="ecore:EClass" name="R4ECommentType" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//CommentType">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EEnum drules.ecore#//R4EDesignRuleClass"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MapToAnomalyType" instanceClassName="java.util.Map$Entry">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//R4EAnomalyType"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="R4EContent" abstract="true" eSuperTypes="../../org.eclipse.mylyn.reviews.frame.core/model/org.eclipse.mylyn.reviews.frame.core.model.ecore#//Location">
+  <eClassifiers xsi:type="ecore:EClass" name="R4EContent" abstract="true" eSuperTypes="platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.ecore#//Location">
     <eStructuralFeatures xsi:type="ecore:EReference" name="location" lowerBound="1"
         eType="#//R4EPosition" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="info" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -245,7 +245,8 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="R4EIDComponent" eSuperTypes="#//R4EReviewComponent">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="id" eType="#//R4EID" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="r4eId" eType="#//R4EID"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MapIDToComponent" instanceClassName="java.util.Map$Entry">
     <eStructuralFeatures xsi:type="ecore:EReference" name="key" lowerBound="1" eType="#//R4EID"/>
@@ -260,11 +261,11 @@
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="R4EContextType">
-    <eLiterals name="R4E_UNDEFINED" value="4"/>
-    <eLiterals name="R4E_ADDED"/>
-    <eLiterals name="R4E_DELETED" value="1"/>
-    <eLiterals name="R4E_MODIFIED" value="2"/>
-    <eLiterals name="R4E_REPLACED" value="3"/>
+    <eLiterals name="Undefined" value="4" literal="UNDEFINED"/>
+    <eLiterals name="Added" literal="ADDED"/>
+    <eLiterals name="Deleted" value="1" literal="DELETED"/>
+    <eLiterals name="Modified" value="2" literal="MODIFIED"/>
+    <eLiterals name="Replaced" value="3" literal="REPLACED"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="IFileRevision" instanceClassName="org.eclipse.team.core.history.IFileRevision"/>
   <eClassifiers xsi:type="ecore:EClass" name="MapDateToDuration" instanceClassName="java.util.Map$Entry">
diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.ecorediag b/org.eclipse.mylyn.reviews.r4e.core/model/r4e.ecorediag
new file mode 100644
index 00000000..ec7d11bc
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/model/r4e.ecorediag
@@ -0,0 +1,1810 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_Z4KzYDsfEeK9hu0ISTvKPQ" type="EcoreTools" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_Z7-8YDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8CmwDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8DN0DsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8JUcDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewGroup/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8JUcTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8JUcjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewGroup/folder"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8JUczsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8J7gDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewGroup/defaultEntryCriteria"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8J7gTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8J7gjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewGroup/availableProjects"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8J7gzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8J7hDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewGroup/availableComponents"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8J7hTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8KikDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewGroup/designRuleLocations"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8KikTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8DN0TsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8DN0jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8DN0zsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8DN1DsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8DN1TsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8DN1jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8DN1zsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z7-8YTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EReviewGroup"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7-8YjsfEeK9hu0ISTvKPQ" x="1760" y="346"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8KikjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8LJoDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8LJoTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8LwsDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8LwsTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8MXwDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/project"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8MXwTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8MXwjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/components"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8MXwzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8M-0DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/entryCriteria"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8M-0TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8M-0jsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/extraNotes"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8M-0zsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8M-1DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/objectives"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8M-1TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8Nl4DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/referenceMaterial"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8Nl4TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8Nl4jsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/startDate"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8Nl4zsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8Nl5DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/endDate"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8Nl5TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8OM8DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/dueDate"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8OM8TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8O0ADsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/modifiedDate"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8O0ATsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8O0AjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReview/type"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8O0AzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8LJojsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8LJozsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8LJpDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8LJpTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8LJpjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8LJpzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8LJqDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8KikzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EReview"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8KilDsfEeK9hu0ISTvKPQ" x="707" y="1576"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8PbEDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8PbEzsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8QCIDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8R3UDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/state"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8R3UTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8SeYDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/dueDate"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8SeYTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8SeYjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/rank"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8SeYzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8SeZDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/notAcceptedReason"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8SeZTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8TFcDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/isImported"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8TFcTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8TFcjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/ruleID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8TFczsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8TFdDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/decidedByID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8TsgDsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8TsgTsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/fixedByID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8TsgjsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8TsgzsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomaly/followUpByID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8TshDsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8QCITsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8QCIjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8QCIzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8QCJDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8QCJTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8QCJjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8QCJzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8PbETsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EAnomaly"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8PbEjsfEeK9hu0ISTvKPQ" x="713" y="740"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8U6oDsfEeK9hu0ISTvKPQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_Z8VhsDsfEeK9hu0ISTvKPQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8VhsTsfEeK9hu0ISTvKPQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_Z8WIwDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EAnomalyState/Created"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8WIwTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8Wv0DsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EAnomalyState/Assigned"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8Wv0TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8Wv0jsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EAnomalyState/Accepted"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8Wv0zsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8Wv1DsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EAnomalyState/Fixed"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8Wv1TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8XW4DsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EAnomalyState/Duplicated"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8XW4TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8XW4jsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EAnomalyState/Rejected"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8XW4zsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8XW5DsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EAnomalyState/Deferred"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8XW5TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8X98DsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EAnomalyState/Verified"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8X98TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8VhsjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8VhszsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8VhtDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8U6oTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="r4e.ecore#//R4EAnomalyState"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8U6ojsfEeK9hu0ISTvKPQ" x="101"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8X98jsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8YlADsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8YlATsfEeK9hu0ISTvKPQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8YlAjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8YlAzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8YlBDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8YlBTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8YlBjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8YlBzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8YlCDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8X98zsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EFormalReview"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8X99DsfEeK9hu0ISTvKPQ" x="222" y="1861"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8ZMEDsfEeK9hu0ISTvKPQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_Z8ZMEzsfEeK9hu0ISTvKPQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8ZMFDsfEeK9hu0ISTvKPQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_Z8ZzIDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EReviewPhase/Started"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8ZzITsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8ZzIjsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EReviewPhase/Preparation"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8ZzIzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8ZzJDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EReviewPhase/Decision"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8aaMDsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8aaMTsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EReviewPhase/Rework"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8aaMjsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8aaMzsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EReviewPhase/Completed"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8aaNDsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8ZMFTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8ZMFjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8ZMFzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8ZMETsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="r4e.ecore#//R4EReviewPhase"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8ZMEjsfEeK9hu0ISTvKPQ" x="369"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8bBQDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8bBQzsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8bBRDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8boVDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4ETextPosition/startPosition"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8boVTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8boVjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4ETextPosition/length"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8boVzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8cPYDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4ETextPosition/startLine"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8cPYTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8cPYjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4ETextPosition/endLine"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8cPYzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8bBRTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8bBRjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8bBRzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8boUDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8boUTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8boUjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8boUzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8bBQTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4ETextPosition"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8bBQjsfEeK9hu0ISTvKPQ" x="1156" y="346"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8cPZDsfEeK9hu0ISTvKPQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_Z8c2cDsfEeK9hu0ISTvKPQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8c2cTsfEeK9hu0ISTvKPQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_Z8ddgDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EUserRole/Reviewer"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8ddgTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8ddgjsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EUserRole/Lead"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8ddgzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8eEkDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EUserRole/Author"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8eEkTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8eEkjsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EUserRole/Organizer"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8eEkzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8c2cjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8c2czsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8c2dDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8cPZTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="r4e.ecore#//R4EUserRole"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8cPZjsfEeK9hu0ISTvKPQ" x="634"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8eElDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8eroDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8eroTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8fSsDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewDecision/spentTime"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8fSsTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8fSsjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewDecision/value"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8fSszsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8erojsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8erozsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8erpDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8erpTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8erpjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8erpzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8erqDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8eElTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EReviewDecision"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8eEljsfEeK9hu0ISTvKPQ" x="224" y="1339"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8f5wDsfEeK9hu0ISTvKPQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_Z8f5wzsfEeK9hu0ISTvKPQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8f5xDsfEeK9hu0ISTvKPQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_Z8gg0DsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EDecision/None"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8gg0TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8gg0jsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EDecision/Accepted"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8gg0zsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8gg1DsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EDecision/AcceptedFollowup"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8gg1TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8hH4DsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EDecision/Rejected"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8hH4TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8f5xTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8f5xjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8f5xzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8f5wTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="r4e.ecore#//R4EDecision"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8f5wjsfEeK9hu0ISTvKPQ" x="900"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8hH4jsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8hu8DsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8hu8TsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8hu-TsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EUser/groupPaths"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8hu-jsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8iWADsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EUser/sequenceIDCounter"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8iWATsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8iWAjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EUser/reviewCreatedByMe"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8iWAzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8iWBDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EUser/reviewCompleted"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8iWBTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8i9EDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EUser/reviewCompletedCode"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8i9ETsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8hu8jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8hu8zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8hu9DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8hu9TsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8hu9jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8hu9zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8hu-DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8hH4zsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EUser"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8hH5DsfEeK9hu0ISTvKPQ" x="1021" y="1166"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8i9EjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8jkIDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8jkITsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8jkKTsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EParticipant/roles"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8jkKjsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8kLMDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EParticipant/focusArea"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8kLMTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8kLMjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EParticipant/isPartOfDecision"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8kLMzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8jkIjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8jkIzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8jkJDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8jkJTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8jkJjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8jkJzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8jkKDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8i9EzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EParticipant"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8i9FDsfEeK9hu0ISTvKPQ" y="1339"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8kLNDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8kyQTsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8kyQjsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8lZUDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EItem/description"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8lZUTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8lZUjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EItem/addedById"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8lZUzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8mAYDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EItem/repositoryRef"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8mAYTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8mAYjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EItem/ProjectURIs"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8mAYzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8mAZDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EItem/authorRep"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8mAZTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8mncDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EItem/submitted"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8mncTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8kyQzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8kyRDsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8kyRTsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8kyRjsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8kyRzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8kySDsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8kySTsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8kLNTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EItem"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8kyQDsfEeK9hu0ISTvKPQ" x="1372" y="977"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8mncjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8nOgDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8nOgTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8nOiTsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4ETextContent/content"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8nOijsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8nOgjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8nOgzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8nOhDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8nOhTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8nOhjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8nOhzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8nOiDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8mnczsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4ETextContent"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8mndDsfEeK9hu0ISTvKPQ" x="1380" y="535"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8n1kDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8n1kzsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8ocoDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8ocqDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EID/sequenceID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8ocqTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8pDsDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EID/userID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8pDsTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8ocoTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8ocojsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8ocozsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8ocpDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8ocpTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8ocpjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8ocpzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8n1kTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EID"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8n1kjsfEeK9hu0ISTvKPQ" x="296" y="221"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8pDsjsfEeK9hu0ISTvKPQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_Z8pqwDsfEeK9hu0ISTvKPQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8pqwTsfEeK9hu0ISTvKPQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_Z8pqxTsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EReviewType/Basic"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8pqxjsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8pqxzsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EReviewType/Informal"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8qR0DsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8qR0TsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EReviewType/Formal"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8qR0jsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8pqwjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8pqwzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8pqxDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8pDszsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="r4e.ecore#//R4EReviewType"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8pDtDsfEeK9hu0ISTvKPQ" x="1185"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8qR0zsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8q44DsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8q44TsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8rf8DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EAnomalyType/type"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8rf8TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8q44jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8q44zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8q45DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8q45TsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8q45jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8q45zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8q46DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8qR1DsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EAnomalyType"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8qR1TsfEeK9hu0ISTvKPQ" x="1762"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8rf8jsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8sHADsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8sHATsfEeK9hu0ISTvKPQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8sHAjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8sHAzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8sHBDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8sHBTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8sHBjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8sHBzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8sHCDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8rf8zsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4ETaskReference"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8rf9DsfEeK9hu0ISTvKPQ" x="714" y="346"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8sHCTsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8suEjsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8suEzsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8tVJDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewState/state"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8tVJTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8suFDsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8suFTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8suFjsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8tVIDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8tVITsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8tVIjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8tVIzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8suEDsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EReviewState"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8suETsfEeK9hu0ISTvKPQ" x="1452"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8tVJjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8t8MDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8t8MTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8ujQDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EComment/createdOn"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8ujQTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8t8MjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8t8MzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8t8NDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8t8NTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8t8NjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8t8NzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8t8ODsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8tVJzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EComment"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8tVKDsfEeK9hu0ISTvKPQ" x="915" y="535"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8ujQjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8vKUDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8vxYDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8wYcDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewComponent/assignedTo"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8wYcTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8vxYTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8vxYjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8vxYzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8vxZDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8vxZTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8vxZjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8vxZzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8ujQzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EReviewComponent"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8ujRDsfEeK9hu0ISTvKPQ" x="848" y="221"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8wYcjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8w_gDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8w_gTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8w_iTsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EFileContext/type"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8w_ijsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8w_gjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8w_gzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8w_hDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8w_hTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8w_hjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8w_hzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8w_iDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8wYczsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EFileContext"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8wYdDsfEeK9hu0ISTvKPQ" x="1408" y="740"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8xmkDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8yNoDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8yNoTsfEeK9hu0ISTvKPQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8yNojsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8yNozsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8yNpDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8yNpTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8yNpjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8yNpzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8yNqDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8xmkTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EDelta"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8xmkjsfEeK9hu0ISTvKPQ" x="1218" y="535"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8yNqTsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8y0sDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8y0sTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z8zbwDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4ECommentType/type"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8zbwTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8y0sjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8y0szsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8y0tDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8y0tTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8y0tjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8y0tzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8y0uDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8yNqjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4ECommentType"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8yNqzsfEeK9hu0ISTvKPQ" x="1928"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8zbwjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z80C0DsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z80C0TsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z80C2TsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//MapToAnomalyType/key"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z80C2jsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z80C0jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z80C0zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z80C1DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z80C1TsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z80C1jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z80C1zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z80C2DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8zbwzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//MapToAnomalyType"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8zbxDsfEeK9hu0ISTvKPQ" x="1574" y="221"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z80p4DsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z80p4zsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z80p5DsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z81Q9DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EContent/info"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z81Q9TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z80p5TsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z80p5jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z80p5zsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z81Q8DsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z81Q8TsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z81Q8jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z81Q8zsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z80p4TsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EContent"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z80p4jsfEeK9hu0ISTvKPQ" x="1336" y="346"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z81Q9jsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z814ADsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z814ATsfEeK9hu0ISTvKPQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z814AjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z814AzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z814BDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z814BTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z814BjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z814BzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z814CDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z81Q9zsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EPosition"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z81Q-DsfEeK9hu0ISTvKPQ" x="1251" y="221"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z82fEDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z82fEzsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z82fFDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z83GJDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EFileVersion/platformURI"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z83GJTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z83GJjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EFileVersion/versionID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z83GJzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z83tMDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EFileVersion/repositoryPath"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z83tMTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z83tMjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EFileVersion/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z83tMzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z83tNDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EFileVersion/resource"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z83tNTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z84UQDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EFileVersion/localVersionID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z84UQTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z84UQjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EFileVersion/fileRevision"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z84UQzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z82fFTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z82fFjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z82fFzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z83GIDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z83GITsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z83GIjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z83GIzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z82fETsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EFileVersion"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z82fEjsfEeK9hu0ISTvKPQ" x="1552" y="535"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z85iYDsfEeK9hu0ISTvKPQ" type="1004">
+    <children xmi:type="notation:Node" xmi:id="_Z86JcDsfEeK9hu0ISTvKPQ" type="4008"/>
+    <children xmi:type="notation:Node" xmi:id="_Z86JcTsfEeK9hu0ISTvKPQ" type="4009"/>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z85iYTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EDataType" href="r4e.ecore#//IResource"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z85iYjsfEeK9hu0ISTvKPQ" x="2148"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z86JcjsfEeK9hu0ISTvKPQ" type="1004">
+    <children xmi:type="notation:Node" xmi:id="_Z86wgDsfEeK9hu0ISTvKPQ" type="4008"/>
+    <children xmi:type="notation:Node" xmi:id="_Z86wgTsfEeK9hu0ISTvKPQ" type="4009"/>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z86JczsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EDataType" href="r4e.ecore#//URI"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z86JdDsfEeK9hu0ISTvKPQ" x="2466"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z86wgjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z87XkDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z87XkTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z87-oDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//MapNameToReview/key"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z87-oTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z87XkjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z87XkzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z87XlDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z87XlTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z87XljsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z87XlzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z87XmDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z86wgzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//MapNameToReview"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z86whDsfEeK9hu0ISTvKPQ" x="2141" y="221"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z87-ojsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z88lsDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z88lsTsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z89MwDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//MapToUsers/key"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z89MwTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z88lsjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z88lszsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z88ltDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z88ltTsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z88ltjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z88ltzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z88luDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z87-ozsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//MapToUsers"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z87-pDsfEeK9hu0ISTvKPQ" x="907" y="1339"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z89MwjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z89z0DsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z89z0TsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z89z2TsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EUserReviews/name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z89z2jsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z8-a4DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EUserReviews/createdReviews"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z8-a4TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z89z0jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z89z0zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z89z1DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z89z1TsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z89z1jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z89z1zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z89z2DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z89MwzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EUserReviews"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z89MxDsfEeK9hu0ISTvKPQ" x="1974" y="535"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8-a4jsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8_B8DsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8_B8TsfEeK9hu0ISTvKPQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8_B8jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8_B8zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8_B9DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8_B9TsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8_B9jsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8_B9zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8_B-DsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8-a4zsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EIDComponent"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8-a5DsfEeK9hu0ISTvKPQ" x="959" y="346"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z8_pADsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z8_pAzsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z8_pBDsfEeK9hu0ISTvKPQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z8_pBTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z8_pBjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z8_pBzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z8_pCDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9AQEDsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9AQETsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9AQEjsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z8_pATsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//MapIDToComponent"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z8_pAjsfEeK9hu0ISTvKPQ" x="569" y="535"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z9AQEzsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z9AQFjsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z9A3IDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z9A3KDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//MapUserIDToUserReviews/key"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9A3KTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9A3ITsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9A3IjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9A3IzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9A3JDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9A3JTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9A3JjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9A3JzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z9AQFDsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//MapUserIDToUserReviews"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z9AQFTsfEeK9hu0ISTvKPQ" x="1935" y="221"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z9A3KjsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z9BeMTsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z9BeMjsfEeK9hu0ISTvKPQ" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9BeMzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9BeNDsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9BeNTsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9BeNjsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9BeNzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9BeODsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9BeOTsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z9A3KzsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EAnomalyTextPosition"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z9BeMDsfEeK9hu0ISTvKPQ" x="1187" y="740"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z9CFQDsfEeK9hu0ISTvKPQ" type="1005">
+    <children xmi:type="notation:Node" xmi:id="_Z9CsUDsfEeK9hu0ISTvKPQ" type="4010"/>
+    <children xmi:type="notation:Node" xmi:id="_Z9CsUTsfEeK9hu0ISTvKPQ" type="5008">
+      <children xmi:type="notation:Node" xmi:id="_Z9CsVTsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EContextType/Undefined"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9CsVjsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9CsVzsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EContextType/Added"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9CsWDsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9DTYDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EContextType/Deleted"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9DTYTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9DTYjsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EContextType/Modified"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9DTYzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9DTZDsfEeK9hu0ISTvKPQ" type="2006">
+        <element xmi:type="ecore:EEnumLiteral" href="r4e.ecore#//R4EContextType/Replaced"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9DTZTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9CsUjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9CsUzsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9CsVDsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z9CFQTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EEnum" href="r4e.ecore#//R4EContextType"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z9CFQjsfEeK9hu0ISTvKPQ" x="2765"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z9D6cDsfEeK9hu0ISTvKPQ" type="1004">
+    <children xmi:type="notation:Node" xmi:id="_Z9D6czsfEeK9hu0ISTvKPQ" type="4008"/>
+    <children xmi:type="notation:Node" xmi:id="_Z9EhgDsfEeK9hu0ISTvKPQ" type="4009"/>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z9D6cTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EDataType" href="r4e.ecore#//IFileRevision"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z9D6cjsfEeK9hu0ISTvKPQ" x="2927"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z9EhgTsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z9EhhDsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z9FIkDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z9FImDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//MapDateToDuration/key"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9FImTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9FImjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//MapDateToDuration/value"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9FImzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9FIkTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9FIkjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9FIkzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9FIlDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9FIlTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9FIljsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9FIlzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z9EhgjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//MapDateToDuration"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z9EhgzsfEeK9hu0ISTvKPQ" x="203" y="1166"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z9FvoDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z9FvozsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z9GWsDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z9GWuDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//MapKeyToInfoAttributes/key"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9GWuTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9GWujsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//MapKeyToInfoAttributes/value"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9GWuzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9GWsTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9GWsjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9GWszsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9GWtDsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9GWtTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9GWtjsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9GWtzsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z9FvoTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//MapKeyToInfoAttributes"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z9FvojsfEeK9hu0ISTvKPQ" x="1561" y="346"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z9G9wDsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z9G9wzsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z9G9xDsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z9Hk1jsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewPhaseInfo/endDate"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9Hk1zsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9Hk2DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewPhaseInfo/type"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9Hk2TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9IL4DsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewPhaseInfo/phaseOwnerID"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9IL4TsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9IL4jsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EReviewPhaseInfo/startDate"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9IL4zsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9G9xTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9Hk0DsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9Hk0TsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9Hk0jsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9Hk0zsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9Hk1DsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9Hk1TsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z9G9wTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EReviewPhaseInfo"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z9G9wjsfEeK9hu0ISTvKPQ" x="203" y="1576"/>
+  </children>
+  <children xmi:type="notation:Node" xmi:id="_Z9Iy8DsfEeK9hu0ISTvKPQ" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_Z9Iy8zsfEeK9hu0ISTvKPQ" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_Z9JaADsfEeK9hu0ISTvKPQ" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_Z9KBFzsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/id"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9KBGDsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9KoIDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/subject"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9KoITsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9KoIjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/location"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9KoIzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9KoJDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/startTime"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9KoJTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9LPMDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/duration"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9LPMTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9LPMjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/sentCount"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9LPMzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9LPNDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/sender"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9LPNTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9L2QDsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/receivers"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9L2QTsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Z9L2QjsfEeK9hu0ISTvKPQ" type="2001">
+        <element xmi:type="ecore:EAttribute" href="r4e.ecore#//R4EMeetingData/body"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9L2QzsfEeK9hu0ISTvKPQ"/>
+      </children>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9KBEDsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9KBETsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9KBEjsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9KBEzsfEeK9hu0ISTvKPQ" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_Z9KBFDsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Z9KBFTsfEeK9hu0ISTvKPQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Z9KBFjsfEeK9hu0ISTvKPQ"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_Z9Iy8TsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+    <element xmi:type="ecore:EClass" href="r4e.ecore#//R4EMeetingData"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z9Iy8jsfEeK9hu0ISTvKPQ" x="441" y="1339"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_Z4KzYTsfEeK9hu0ISTvKPQ"/>
+  <element xmi:type="ecore:EPackage" href="r4e.ecore#/"/>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9OSgDsfEeK9hu0ISTvKPQ" type="3002" source="_Z7-8YDsfEeK9hu0ISTvKPQ" target="_Z8qR0zsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9XccDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9Z4sDsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9afwDsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9afwTsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9OSgTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9OSgjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReviewGroup/availableAnomalyTypes"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9OSgzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 297]$[0, -297, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHV30DsfEeK9hu0ISTvKPQ" id="(0.3128491620111732,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHV30TsfEeK9hu0ISTvKPQ" id="(0.5142857142857142,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9bG0DsfEeK9hu0ISTvKPQ" type="3002" source="_Z7-8YDsfEeK9hu0ISTvKPQ" target="_Z8zbwjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9bG1DsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9bG1TsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9bG1jsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9bG1zsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9bG0TsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9bG0jsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReviewGroup/anomalyTypeKeyToReference"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9bG0zsfEeK9hu0ISTvKPQ" points="[0, 0, 163, 76]$[-163, -76, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHPKITsfEeK9hu0ISTvKPQ" id="(0.20670391061452514,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHPxMDsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9bt4DsfEeK9hu0ISTvKPQ" type="3002" source="_Z7-8YDsfEeK9hu0ISTvKPQ" target="_Z86wgjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9bt5DsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9bt5TsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9bt5jsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9bt5zsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9bt4TsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9bt4jsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReviewGroup/reviewsMap"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9bt4zsfEeK9hu0ISTvKPQ" points="[0, 0, -271, 76]$[241, -61, -30, 15]$[271, -76, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHQYQDsfEeK9hu0ISTvKPQ" id="(0.770949720670391,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHQYQTsfEeK9hu0ISTvKPQ" id="(0.24347826086956523,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9bt6DsfEeK9hu0ISTvKPQ" type="3002" source="_Z7-8YDsfEeK9hu0ISTvKPQ" target="_Z9AQEzsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9cU8DsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9cU8TsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9cU8jsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9cU8zsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9bt6TsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9bt6jsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReviewGroup/userReviews"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9bt6zsfEeK9hu0ISTvKPQ" points="[0, 0, -115, 76]$[98, -61, -17, 15]$[115, -76, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHOjETsfEeK9hu0ISTvKPQ" id="(0.5418994413407822,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHPKIDsfEeK9hu0ISTvKPQ" id="(0.2534246575342466,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9c8ADsfEeK9hu0ISTvKPQ" type="3003" source="_Z7-8YDsfEeK9hu0ISTvKPQ" target="_Z8ujQjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9c8ATsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9c8AjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9c8AzsfEeK9hu0ISTvKPQ" points="[0, 0, 817, 76]$[0, -30, 817, 46]$[-817, -30, 0, 46]$[-817, -76, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHQ_UDsfEeK9hu0ISTvKPQ" id="(0.1005586592178771,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHQ_UTsfEeK9hu0ISTvKPQ" id="(0.8692307692307693,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9c8BDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8KikjsfEeK9hu0ISTvKPQ" target="_Z8eElDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9djEDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9djETsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9djEjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9djEzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9c8BTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9c8BjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReview/decision"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9c8BzsfEeK9hu0ISTvKPQ" points="[0, 0, 436, 172]$[-389, -61, 47, 111]$[-436, -172, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHFZIDsfEeK9hu0ISTvKPQ" id="(0.10062893081761007,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHFZITsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9djFDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8KikjsfEeK9hu0ISTvKPQ" target="_Z8PbEDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9djGDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9djGTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9djGjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9djGzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9djFTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9djFjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReview/anomalyTemplate"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9djFzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 659]$[0, -659, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHQ_UjsfEeK9hu0ISTvKPQ" id="(0.5094339622641509,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHRmYDsfEeK9hu0ISTvKPQ" id="(0.43859649122807015,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9eKIDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8KikjsfEeK9hu0ISTvKPQ" target="_Z87-ojsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9eKJDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9eKJTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9eKJjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9eKJzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9eKITsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9eKIjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReview/usersMap"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9eKIzsfEeK9hu0ISTvKPQ" points="[0, 0, -155, 188]$[113, -61, -42, 127]$[155, -188, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHEyEDsfEeK9hu0ISTvKPQ" id="(0.6037735849056604,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHEyETsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9exMDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8KikjsfEeK9hu0ISTvKPQ" target="_Z8hH4jsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9exNDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9exNTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9exNjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9exNzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9exMTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9exMjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReview/createdBy"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9exMzsfEeK9hu0ISTvKPQ" points="[0, 0, -290, 297]$[290, -61, 0, 236]$[290, -297, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHSNcTsfEeK9hu0ISTvKPQ" id="(0.7044025157232704,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHSNcjsfEeK9hu0ISTvKPQ" id="(0.49162011173184356,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9exODsfEeK9hu0ISTvKPQ" type="3002" source="_Z8KikjsfEeK9hu0ISTvKPQ" target="_Z8_pADsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9fYQDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9fYQTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9fYQjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9fYQzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9exOTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9exOjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReview/idsMap"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9exOzsfEeK9hu0ISTvKPQ" points="[0, 0, 130, 999]$[-128, -61, 2, 938]$[-141, -660, -11, 339]$[-141, -836, -11, 163]$[-130, -999, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHawUTsfEeK9hu0ISTvKPQ" id="(0.4025157232704403,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHawUjsfEeK9hu0ISTvKPQ" id="(0.5950413223140496,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9fYRDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8KikjsfEeK9hu0ISTvKPQ" target="_Z9Iy8DsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9f_UDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9f_UTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9f_UjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9f_UzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9fYRTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9fYRjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EReview/activeMeeting"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9fYRzsfEeK9hu0ISTvKPQ" points="[0, 0, 255, 60]$[-255, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHDj8TsfEeK9hu0ISTvKPQ" id="(0.3018867924528302,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHELADsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9f_VDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8KikjsfEeK9hu0ISTvKPQ" target="_Z8ujQjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9f_VTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9f_VjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9f_VzsfEeK9hu0ISTvKPQ" points="[0, 0, -116, 1306]$[0, -30, -116, 1276]$[-344, -30, -460, 1276]$[-344, -1260, -460, 46]$[116, -1260, 0, 46]$[116, -1306, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHXF8jsfEeK9hu0ISTvKPQ" id="(0.20125786163522014,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHXtADsfEeK9hu0ISTvKPQ" id="(0.05384615384615385,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9f_WDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8PbEDsfEeK9hu0ISTvKPQ" target="_Z82fEDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9gmYTsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9gmYjsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9gmYzsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9gmZDsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9f_WTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9f_WjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EAnomaly/fixedInVersion"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9gmYDsfEeK9hu0ISTvKPQ" points="[0, 0, -734, 60]$[734, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHMt4DsfEeK9hu0ISTvKPQ" id="(0.7953216374269005,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHMt4TsfEeK9hu0ISTvKPQ" id="(0.1987179487179487,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9gmZTsfEeK9hu0ISTvKPQ" type="3003" source="_Z8PbEDsfEeK9hu0ISTvKPQ" target="_Z8ujQjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9gmZjsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9gmZzsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9gmaDsfEeK9hu0ISTvKPQ" points="[0, 0, -122, 470]$[0, -30, -122, 440]$[122, -30, 0, 440]$[122, -470, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHYUEDsfEeK9hu0ISTvKPQ" id="(0.19883040935672514,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHYUETsfEeK9hu0ISTvKPQ" id="(0.16153846153846155,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9hNcDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8PbEDsfEeK9hu0ISTvKPQ" target="_Z8tVJjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9hNcTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9hNcjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9hNczsfEeK9hu0ISTvKPQ" points="[0, 0, -164, 156]$[0, -30, -164, 126]$[164, -30, 0, 126]$[164, -156, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHMG0DsfEeK9hu0ISTvKPQ" id="(0.39766081871345027,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHMG0TsfEeK9hu0ISTvKPQ" id="(0.25210084033613445,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9h0gDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8X98jsfEeK9hu0ISTvKPQ" target="_Z8i9EjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9h0hDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9h0hTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9h0hjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9h0hzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9h0gTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9h0gjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EFormalReview/phaseOwner"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9h0gzsfEeK9hu0ISTvKPQ" points="[0, 0, 164, 441]$[-164, -61, 0, 380]$[-164, -441, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHTbkDsfEeK9hu0ISTvKPQ" id="(0.24528301886792453,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHUCoDsfEeK9hu0ISTvKPQ" id="(0.5121951219512195,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9ibkDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8X98jsfEeK9hu0ISTvKPQ" target="_Z9G9wDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9iblDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9iblTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9ibljsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9iblzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9ibkTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9ibkjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EFormalReview/phases"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9ibkzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 188]$[0, -188, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG9dUDsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG9dUTsfEeK9hu0ISTvKPQ" id="(0.496551724137931,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9ibmDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8X98jsfEeK9hu0ISTvKPQ" target="_Z9G9wDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9jCoDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9jCoTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9jCojsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9jCozsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9ibmTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9ibmjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EFormalReview/current"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9ibmzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 188]$[0, -188, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG-rcTsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG-rcjsfEeK9hu0ISTvKPQ" id="(0.496551724137931,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9jCpDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8X98jsfEeK9hu0ISTvKPQ" target="_Z8KikjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9jCpTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9jCpjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9jCpzsfEeK9hu0ISTvKPQ" points="[0, 0, -485, 60]$[0, -30, -485, 30]$[485, -30, 0, 30]$[485, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG-EYDsfEeK9hu0ISTvKPQ" id="(0.7452830188679245,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG-rcDsfEeK9hu0ISTvKPQ" id="(0.4968553459119497,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9jpsDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8bBQDsfEeK9hu0ISTvKPQ" target="_Z81Q9jsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9jpsTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9jpsjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9jpszsfEeK9hu0ISTvKPQ" points="[0, 0, -69, 83]$[0, -30, -69, 53]$[69, -30, 0, 53]$[69, -83, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG7oITsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG7oIjsfEeK9hu0ISTvKPQ" id="(0.3333333333333333,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9jptDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8hH4jsfEeK9hu0ISTvKPQ" target="_Z8tVJjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9kQwDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9kQwTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9kQwjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9kQwzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9jptTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9jptjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EUser/addedComments"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9jptzsfEeK9hu0ISTvKPQ" points="[0, 0, 59, 582]$[-59, -61, 0, 521]$[-59, -582, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHWe4DsfEeK9hu0ISTvKPQ" id="(0.24581005586592178,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHWe4TsfEeK9hu0ISTvKPQ" id="(0.7647058823529411,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9kQxDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8hH4jsfEeK9hu0ISTvKPQ" target="_Z8kLNDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9k30DsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9k30TsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9le4DsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9le4TsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9kQxTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9kQxjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EUser/addedItems"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9kQxzsfEeK9hu0ISTvKPQ" points="[0, 0, -287, 60]$[287, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHLfwDsfEeK9hu0ISTvKPQ" id="(0.7486033519553073,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHLfwTsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9le4jsfEeK9hu0ISTvKPQ" type="3002" source="_Z8hH4jsfEeK9hu0ISTvKPQ" target="_Z8KikjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9mF8DsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9mF8TsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9mF8jsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9mF8zsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9le4zsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9le5DsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EUser/reviewInstance"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9le5TsfEeK9hu0ISTvKPQ" points="[0, 0, 320, -297]$[117, 60, 437, -237]$[117, 236, 437, -61]$[-320, 297, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHS0gDsfEeK9hu0ISTvKPQ" id="(0.7430167597765364,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHS0gTsfEeK9hu0ISTvKPQ" id="(0.7987421383647799,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9mF9DsfEeK9hu0ISTvKPQ" type="3003" source="_Z8hH4jsfEeK9hu0ISTvKPQ" target="_Z8ujQjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9mF9TsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9mF9jsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9mF9zsfEeK9hu0ISTvKPQ" points="[0, 0, 165, 896]$[0, -850, 165, 46]$[-165, -850, 0, 46]$[-165, -896, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHXtATsfEeK9hu0ISTvKPQ" id="(0.4972067039106145,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHXtAjsfEeK9hu0ISTvKPQ" id="(0.7461538461538462,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9mtADsfEeK9hu0ISTvKPQ" type="3002" source="_Z8i9EjsfEeK9hu0ISTvKPQ" target="_Z8n1kDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9mtBDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9mtBTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9mtBjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9mtBzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9mtATsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9mtAjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EParticipant/reviewedContent"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9mtAzsfEeK9hu0ISTvKPQ" points="[0, 0, -242, 1053]$[0, -173, -242, 880]$[154, -993, -88, 60]$[242, -1053, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHVQwDsfEeK9hu0ISTvKPQ" id="(0.5060975609756098,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHVQwTsfEeK9hu0ISTvKPQ" id="(0.25217391304347825,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9nUEDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8i9EjsfEeK9hu0ISTvKPQ" target="_Z9EhgTsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9nUFDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9nUFTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9nUFjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9nUFzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9nUETsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9nUEjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EParticipant/timeLog"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9nUEzsfEeK9hu0ISTvKPQ" points="[0, 0, -162, 108]$[111, -61, -51, 47]$[162, -108, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHJDgDsfEeK9hu0ISTvKPQ" id="(0.6707317073170732,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHJDgTsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9n7IDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8i9EjsfEeK9hu0ISTvKPQ" target="_Z8hH4jsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9n7ITsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9n7IjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9n7IzsfEeK9hu0ISTvKPQ" points="[0, 0, -913, 60]$[0, -30, -913, 30]$[913, -30, 0, 30]$[913, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHJqkDsfEeK9hu0ISTvKPQ" id="(0.8353658536585366,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHJqkTsfEeK9hu0ISTvKPQ" id="(0.16201117318435754,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9n7JDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8kLNDsfEeK9hu0ISTvKPQ" target="_Z8wYcjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9n7KDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9n7KTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9oiMDsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9oiMTsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9n7JTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9n7JjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EItem/fileContextList"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9n7JzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 188]$[0, -188, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHBHsTsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHBuwDsfEeK9hu0ISTvKPQ" id="(0.23943661971830985,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9oiMjsfEeK9hu0ISTvKPQ" type="3002" source="_Z8kLNDsfEeK9hu0ISTvKPQ" target="_Z9FvoDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9oiNjsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9oiNzsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9oiODsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9oiOTsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9oiMzsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9oiNDsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EItem/infoAtt"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9oiNTsfEeK9hu0ISTvKPQ" points="[0, 0, -199, 566]$[153, -61, -46, 505]$[414, -298, 215, 268]$[414, -442, 215, 124]$[220, -503, 21, 63]$[199, -566, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHb-cTsfEeK9hu0ISTvKPQ" id="(0.75,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHclgDsfEeK9hu0ISTvKPQ" id="(0.8273381294964028,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9pJQDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8kLNDsfEeK9hu0ISTvKPQ" target="_Z8-a4jsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9pJQTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9pJQjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9pJQzsfEeK9hu0ISTvKPQ" points="[0, 0, 382, 589]$[0, -30, 382, 559]$[-266, -30, 116, 559]$[-266, -267, 116, 322]$[-328, -267, 54, 322]$[-328, -472, 54, 117]$[-382, -472, 0, 117]$[-382, -589, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHaJQDsfEeK9hu0ISTvKPQ" id="(0.25,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHaJQTsfEeK9hu0ISTvKPQ" id="(0.6226415094339622,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9pJRDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8mncjsfEeK9hu0ISTvKPQ" target="_Z80p4DsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9pJRTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9pJRjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9pJRzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 140]$[0, -140, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHC84DsfEeK9hu0ISTvKPQ" id="(0.0625,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHC84TsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9pwUDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8rf8jsfEeK9hu0ISTvKPQ" target="_Z8ujQjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9pwUTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9pwUjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9pwUzsfEeK9hu0ISTvKPQ" points="[0, 0, -93, 76]$[0, -30, -93, 46]$[93, -30, 0, 46]$[93, -76, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG7BEDsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG7oIDsfEeK9hu0ISTvKPQ" id="(0.1076923076923077,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9pwVDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8tVJjsfEeK9hu0ISTvKPQ" target="_Z8PbEDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9qXYDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9qXYTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9qXYjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9qXYzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9pwVTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9pwVjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EComment/anomaly"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9pwVzsfEeK9hu0ISTvKPQ" points="[0, 0, 160, -156]$[-17, 95, 143, -61]$[-160, 156, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG_SgDsfEeK9hu0ISTvKPQ" id="(0.5042016806722689,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG_5kDsfEeK9hu0ISTvKPQ" id="(0.5964912280701754,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9qXZDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8tVJjsfEeK9hu0ISTvKPQ" target="_Z9FvoDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9q-cDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9q-cTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9q-cjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9q-czsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9qXZTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9qXZjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EComment/infoAtt"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9qXZzsfEeK9hu0ISTvKPQ" points="[0, 0, -572, 124]$[495, -61, -77, 63]$[572, -124, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHAgoTsfEeK9hu0ISTvKPQ" id="(0.907563025210084,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHBHsDsfEeK9hu0ISTvKPQ" id="(0.2446043165467626,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9q-dDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8tVJjsfEeK9hu0ISTvKPQ" target="_Z8ujQjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9q-dTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9q-djsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9q-dzsfEeK9hu0ISTvKPQ" points="[0, 0, 50, 265]$[0, -30, 50, 235]$[-50, -30, 0, 235]$[-50, -265, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHXF8DsfEeK9hu0ISTvKPQ" id="(0.40336134453781514,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHXF8TsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9rlgDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8tVJjsfEeK9hu0ISTvKPQ" target="_Z8-a4jsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9rlgTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9rlgjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9rlgzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 147]$[0, -147, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG_5kTsfEeK9hu0ISTvKPQ" id="(0.8151260504201681,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHAgoDsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9rlhDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8wYcjsfEeK9hu0ISTvKPQ" target="_Z8xmkDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9rliDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9rliTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9sMkDsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9sMkTsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9rlhTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9rlhjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EFileContext/deltas"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9rlhzsfEeK9hu0ISTvKPQ" points="[0, 0, 186, 163]$[-145, -61, 41, 102]$[-186, -163, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHGAMDsfEeK9hu0ISTvKPQ" id="(0.33098591549295775,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHGAMTsfEeK9hu0ISTvKPQ" id="(0.5,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9sMkjsfEeK9hu0ISTvKPQ" type="3002" source="_Z8wYcjsfEeK9hu0ISTvKPQ" target="_Z82fEDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9sMljsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9sMlzsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9sMmDsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9sMmTsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9sMkzsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9sMlDsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EFileContext/base"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9sMlTsfEeK9hu0ISTvKPQ" points="[0, 0, -174, 60]$[174, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHHOUDsfEeK9hu0ISTvKPQ" id="(0.6619718309859155,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHHOUTsfEeK9hu0ISTvKPQ" id="(0.7948717948717948,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9szoDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8wYcjsfEeK9hu0ISTvKPQ" target="_Z82fEDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9szpDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9szpTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9szpjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9szpzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9szoTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9szojsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EFileContext/target"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9szozsfEeK9hu0ISTvKPQ" points="[0, 0, -166, 60]$[166, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHGnQDsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHGnQTsfEeK9hu0ISTvKPQ" id="(0.5961538461538461,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9szqDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8wYcjsfEeK9hu0ISTvKPQ" target="_Z9FvoDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9tasDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9tasTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9tasjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9taszsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9szqTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9szqjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EFileContext/infoAtt"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9szqzsfEeK9hu0ISTvKPQ" points="[0, 0, -127, 329]$[262, -61, 135, 268]$[262, -205, 135, 124]$[138, -266, 11, 63]$[127, -329, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHclgTsfEeK9hu0ISTvKPQ" id="(0.8309859154929577,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHdMkDsfEeK9hu0ISTvKPQ" id="(0.6618705035971223,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9tatDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8wYcjsfEeK9hu0ISTvKPQ" target="_Z8-a4jsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9tatTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9tatjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9tatzsfEeK9hu0ISTvKPQ" points="[0, 0, 393, 352]$[0, -30, 393, 322]$[-290, -30, 103, 322]$[-290, -235, 103, 117]$[-393, -235, 0, 117]$[-393, -352, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHaJQjsfEeK9hu0ISTvKPQ" id="(0.1619718309859155,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHawUDsfEeK9hu0ISTvKPQ" id="(0.7452830188679245,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9uBwDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8xmkDsfEeK9hu0ISTvKPQ" target="_Z80p4DsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9uBxDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9uBxTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9uBxjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9uBxzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9uBwTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9uBwjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EDelta/base"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9uBwzsfEeK9hu0ISTvKPQ" points="[0, 0, -76, 140]$[65, -61, -11, 79]$[76, -140, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHN8ATsfEeK9hu0ISTvKPQ" id="(0.7450980392156863,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHOjEDsfEeK9hu0ISTvKPQ" id="(0.3333333333333333,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9uByDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8xmkDsfEeK9hu0ISTvKPQ" target="_Z80p4DsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9uo0DsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9uo0TsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9uo0jsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9uo0zsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9uByTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9uByjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EDelta/target"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9uByzsfEeK9hu0ISTvKPQ" points="[0, 0, -84, 140]$[63, -61, -21, 79]$[84, -140, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHNU8jsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHN8ADsfEeK9hu0ISTvKPQ" id="(0.16666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9uo1DsfEeK9hu0ISTvKPQ" type="3003" source="_Z8xmkDsfEeK9hu0ISTvKPQ" target="_Z8-a4jsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9uo1TsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9uo1jsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9uo1zsfEeK9hu0ISTvKPQ" points="[0, 0, 192, 147]$[0, -30, 192, 117]$[-192, -30, 0, 117]$[-192, -147, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHNU8DsfEeK9hu0ISTvKPQ" id="(0.24509803921568626,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHNU8TsfEeK9hu0ISTvKPQ" id="(0.8679245283018868,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9vP4DsfEeK9hu0ISTvKPQ" type="3002" source="_Z8zbwjsfEeK9hu0ISTvKPQ" target="_Z8qR0zsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9vP5DsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9vP5TsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9vP5jsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9vP5zsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9vP4TsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9vP4jsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//MapToAnomalyType/value"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9vP4zsfEeK9hu0ISTvKPQ" points="[0, 0, -155, 172]$[155, -172, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHBuwTsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHCV0DsfEeK9hu0ISTvKPQ" id="(0.2571428571428571,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9v28DsfEeK9hu0ISTvKPQ" type="3002" source="_Z80p4DsfEeK9hu0ISTvKPQ" target="_Z81Q9jsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9v29DsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9v29TsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9v29jsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9v29zsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9v28TsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9v28jsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EContent/location"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9v28zsfEeK9hu0ISTvKPQ" points="[0, 0, 68, 83]$[-68, -83, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHC84jsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHDj8DsfEeK9hu0ISTvKPQ" id="(0.6666666666666666,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9v2-DsfEeK9hu0ISTvKPQ" type="3002" source="_Z82fEDsfEeK9hu0ISTvKPQ" target="_Z9FvoDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9weADsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9weATsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9weAjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9weAzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9v2-TsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9v2-jsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EFileVersion/infoAtt"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9v2-zsfEeK9hu0ISTvKPQ" points="[0, 0, 0, 124]$[0, -124, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG82QDsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG82QTsfEeK9hu0ISTvKPQ" id="(0.49640287769784175,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9weBDsfEeK9hu0ISTvKPQ" type="3002" source="_Z86wgjsfEeK9hu0ISTvKPQ" target="_Z8KikjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9weCDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9weCTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9xFEDsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9xFETsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9weBTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9weBjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//MapNameToReview/value"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9weBzsfEeK9hu0ISTvKPQ" points="[0, 0, 1377, -1306]$[40, 76, 1417, -1230]$[40, 204, 1417, -1102]$[-36, 409, 1341, -897]$[-245, 646, 1132, -660]$[-826, 1245, 551, -61]$[-1377, 1306, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHZiMDsfEeK9hu0ISTvKPQ" id="(0.7478260869565218,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHZiMTsfEeK9hu0ISTvKPQ" id="(0.89937106918239,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9xFEjsfEeK9hu0ISTvKPQ" type="3002" source="_Z87-ojsfEeK9hu0ISTvKPQ" target="_Z8hH4jsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9xFFjsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9xFFzsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9xFGDsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9xFGTsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9xFEzsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9xFFDsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//MapToUsers/value"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9xFFTsfEeK9hu0ISTvKPQ" points="[0, 0, -121, 60]$[121, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHKRoDsfEeK9hu0ISTvKPQ" id="(0.5,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHKRoTsfEeK9hu0ISTvKPQ" id="(0.3240223463687151,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9xsIDsfEeK9hu0ISTvKPQ" type="3002" source="_Z89MwjsfEeK9hu0ISTvKPQ" target="_Z86wgjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9xsJDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9xsJTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9xsJjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9xsJzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9xsITsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9xsIjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EUserReviews/invitedToMap"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9xsIzsfEeK9hu0ISTvKPQ" points="[0, 0, -132, 265]$[71, -61, -61, 204]$[73, -189, -59, 76]$[132, -265, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHYUEjsfEeK9hu0ISTvKPQ" id="(0.6174496644295302,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHY7IDsfEeK9hu0ISTvKPQ" id="(0.4956521739130435,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9xsKDsfEeK9hu0ISTvKPQ" type="3002" source="_Z89MwjsfEeK9hu0ISTvKPQ" target="_Z7-8YDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9yTMDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9yTMTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9yTMjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9yTMzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9xsKTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9xsKjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EUserReviews/group"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9xsKzsfEeK9hu0ISTvKPQ" points="[0, 0, 143, 60]$[-143, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG8PMDsfEeK9hu0ISTvKPQ" id="(0.12080536912751678,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG8PMTsfEeK9hu0ISTvKPQ" id="(0.4972067039106145,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9yTNDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8-a4jsfEeK9hu0ISTvKPQ" target="_Z8n1kDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9yTODsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9yTOTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9yTOjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9yTOzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9yTNTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9yTNjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EIDComponent/r4eId"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9yTNzsfEeK9hu0ISTvKPQ" points="[0, 0, 611, 60]$[-611, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHH1YDsfEeK9hu0ISTvKPQ" id="(0.330188679245283,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHH1YTsfEeK9hu0ISTvKPQ" id="(0.7565217391304347,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9y6QDsfEeK9hu0ISTvKPQ" type="3003" source="_Z8-a4jsfEeK9hu0ISTvKPQ" target="_Z8ujQjsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9y6QTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9y6QjsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9y6QzsfEeK9hu0ISTvKPQ" points="[0, 0, 100, 76]$[0, -30, 100, 46]$[-100, -30, 0, 46]$[-100, -76, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHIccDsfEeK9hu0ISTvKPQ" id="(0.660377358490566,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHIccTsfEeK9hu0ISTvKPQ" id="(0.6230769230769231,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9y6RDsfEeK9hu0ISTvKPQ" type="3002" source="_Z8_pADsfEeK9hu0ISTvKPQ" target="_Z8n1kDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z9zhUzsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9zhVDsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z9zhVTsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z9zhVjsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9zhUDsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9zhUTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//MapIDToComponent/key"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9zhUjsfEeK9hu0ISTvKPQ" points="[0, 0, 254, 249]$[-254, -61, 0, 188]$[-254, -249, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHUCoTsfEeK9hu0ISTvKPQ" id="(0.3305785123966942,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHUpsDsfEeK9hu0ISTvKPQ" id="(0.5130434782608696,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z9zhVzsfEeK9hu0ISTvKPQ" type="3002" source="_Z8_pADsfEeK9hu0ISTvKPQ" target="_Z8-a4jsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z90IYDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z90IYTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z90IYjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z90IYzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z9zhWDsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z9zhWTsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//MapIDToComponent/value"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z9zhWjsfEeK9hu0ISTvKPQ" points="[0, 0, -336, 147]$[306, -61, -30, 86]$[336, -147, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG6aADsfEeK9hu0ISTvKPQ" id="(0.6611570247933884,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aG6aATsfEeK9hu0ISTvKPQ" id="(0.24528301886792453,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z90IZDsfEeK9hu0ISTvKPQ" type="3002" source="_Z9AQEzsfEeK9hu0ISTvKPQ" target="_Z89MwjsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z90IaDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z90IaTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z90IajsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z90IazsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z90IZTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z90IZjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//MapUserIDToUserReviews/value"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z90IZzsfEeK9hu0ISTvKPQ" points="[0, 0, 0, -265]$[0, 265, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHbXYDsfEeK9hu0ISTvKPQ" id="(0.5136986301369864,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHb-cDsfEeK9hu0ISTvKPQ" id="(0.24161073825503357,0.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z90vcDsfEeK9hu0ISTvKPQ" type="3002" source="_Z9A3KjsfEeK9hu0ISTvKPQ" target="_Z82fEDsfEeK9hu0ISTvKPQ">
+    <children xmi:type="notation:Node" xmi:id="_Z90vdDsfEeK9hu0ISTvKPQ" type="4011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z90vdTsfEeK9hu0ISTvKPQ" x="-10" y="-10"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_Z90vdjsfEeK9hu0ISTvKPQ" type="4012">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Z90vdzsfEeK9hu0ISTvKPQ" x="10" y="10"/>
+    </children>
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z90vcTsfEeK9hu0ISTvKPQ" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z90vcjsfEeK9hu0ISTvKPQ" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+    <element xmi:type="ecore:EReference" href="r4e.ecore#//R4EAnomalyTextPosition/file"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z90vczsfEeK9hu0ISTvKPQ" points="[0, 0, -333, 60]$[333, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHK4sDsfEeK9hu0ISTvKPQ" id="(0.6619718309859155,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHK4sTsfEeK9hu0ISTvKPQ" id="(0.3974358974358974,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Z90veDsfEeK9hu0ISTvKPQ" type="3003" source="_Z9A3KjsfEeK9hu0ISTvKPQ" target="_Z8bBQDsfEeK9hu0ISTvKPQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z90veTsfEeK9hu0ISTvKPQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Z90vejsfEeK9hu0ISTvKPQ" fontName="Lucida Grande"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z90vezsfEeK9hu0ISTvKPQ" points="[0, 0, 62, 297]$[0, -30, 62, 267]$[-62, -30, 0, 267]$[-62, -297, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHRmYTsfEeK9hu0ISTvKPQ" id="(0.33098591549295775,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aHSNcDsfEeK9hu0ISTvKPQ" id="(0.13333333333333333,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.genmodel b/org.eclipse.mylyn.reviews.r4e.core/model/r4e.genmodel
index 24f526dc..12da49b8 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/model/r4e.genmodel
+++ b/org.eclipse.mylyn.reviews.r4e.core/model/r4e.genmodel
@@ -1,250 +1,251 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010 Ericsson AB and others.&#xD;&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials are&#xD;&#xA;made available under the terms of the Eclipse Public License v1.0 which&#xD;&#xA;accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;Ericsson AB"

-    modelDirectory="/org.eclipse.mylyn.reviews.r4e.core/src" modelPluginID="org.eclipse.mylyn.reviews.r4e.core"

-    modelName="R4e" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"

-    complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.eclipse.mylyn.reviews.frame.core/model/framework.genmodel#//model r4e.drules.genmodel#//drules"

-    classNamePattern="">

-  <foreignModel>org.eclipse.mylyn.reviews.r4e.core.model.ecore</foreignModel>

-  <genPackages prefix="RModel" basePackage="org.eclipse.mylyn.reviews.r4e.core" resource="XML"

-      disposableProviderFactory="true" dataTypeConverters="true" ecorePackage="org.eclipse.mylyn.reviews.r4e.core.model.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState">

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_CREATED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_ASSIGNED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_ACCEPTED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_FIXED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_DUPLICATED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_REJECTED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_DEFERRED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyState/R4E_ANOMALY_STATE_VERIFIED"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhase">

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhase/R4E_REVIEW_PHASE_STARTED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhase/R4E_REVIEW_PHASE_PREPARATION"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhase/R4E_REVIEW_PHASE_DECISION"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhase/R4E_REVIEW_PHASE_REWORK"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhase/R4E_REVIEW_PHASE_COMPLETED"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole">

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole/R4E_ROLE_REVIEWER"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole/R4E_ROLE_LEAD"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole/R4E_ROLE_AUTHOR"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserRole/R4E_ROLE_ORGANIZER"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDecision">

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDecision/R4E_REVIEW_DECISION_NONE"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDecision/R4E_REVIEW_DECISION_ACCEPTED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDecision/R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDecision/R4E_REVIEW_DECISION_REJECTED"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewType">

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewType/R4E_REVIEW_TYPE_BASIC"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewType/R4E_REVIEW_TYPE_INFORMAL"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewType/R4E_REVIEW_TYPE_FORMAL"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType">

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_UNDEFINED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_ADDED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_DELETED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_MODIFIED"/>

-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContextType/R4E_REPLACED"/>

-    </genEnums>

-    <genDataTypes ecoreDataType="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//IResource"/>

-    <genDataTypes ecoreDataType="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//URI"/>

-    <genDataTypes ecoreDataType="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//IFileRevision"/>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/folder"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/defaultEntryCriteria"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/availableProjects"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/availableComponents"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/designRuleLocations"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/availableAnomalyTypes"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/anomalyTypeKeyToReference"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/reviewsMap"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewGroup/userReviews"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/project"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/components"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/entryCriteria"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/extraNotes"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/objectives"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/referenceMaterial"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/decision"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/startDate"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/endDate"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/anomalyTemplate"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/type"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/usersMap"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/createdBy"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/idsMap"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReview/activeMeeting"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/state"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/dueDate"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/rank"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/rule"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/notAcceptedReason"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/isImported"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/fixedInVersion"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/ruleID"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/decidedByID"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/fixedByID"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomaly/followUpByID"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFormalReview">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFormalReview/phaseOwner"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFormalReview/phases"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFormalReview/current"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition/startPosition"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition/length"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition/startLine"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextPosition/endLine"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewDecision">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewDecision/spentTime"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewDecision/value"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/groupPaths"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/sequenceIDCounter"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/addedComments"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/addedItems"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/reviewCreatedByMe"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/reviewInstance"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/reviewCompleted"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUser/reviewCompletedCode"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/roles"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/focusArea"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/isPartOfDecision"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/reviewedContent"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EParticipant/timeLog"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/description"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/addedById"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/fileContextList"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/repositoryRef"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/ProjectURIs"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/authorRep"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/submitted"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EItem/infoAtt"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextContent">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETextContent/content"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EID">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EID/sequenceID"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EID/userID"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyType">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyType/type"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ETaskReference"/>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewState">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewState/state"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EComment">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EComment/createdOn"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EComment/anomaly"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EComment/infoAtt"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewComponent">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewComponent/assignedTo"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/deltas"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/base"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/target"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/type"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileContext/infoAtt"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDelta">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDelta/base"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EDelta/target"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ECommentType">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4ECommentType/type"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToAnomalyType">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToAnomalyType/key"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToAnomalyType/value"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContent">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContent/location"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EContent/info"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EPosition"/>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/platformURI"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/versionID"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/repositoryPath"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/resource"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/localVersionID"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/fileRevision"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EFileVersion/infoAtt"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapNameToReview">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapNameToReview/key"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapNameToReview/value"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToUsers">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToUsers/key"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapToUsers/value"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews/name"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews/invitedToMap"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews/group"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EUserReviews/createdReviews"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EIDComponent">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EIDComponent/id"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapIDToComponent">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapIDToComponent/key"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapIDToComponent/value"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapUserIDToUserReviews">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapUserIDToUserReviews/key"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapUserIDToUserReviews/value"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyTextPosition">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EAnomalyTextPosition/file"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapDateToDuration">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapDateToDuration/key"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapDateToDuration/value"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapKeyToInfoAttributes">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapKeyToInfoAttributes/key"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//MapKeyToInfoAttributes/value"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo/endDate"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo/type"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo/phaseOwnerID"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EReviewPhaseInfo/startDate"/>

-    </genClasses>

-    <genClasses ecoreClass="org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/id"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/subject"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/location"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/startTime"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/duration"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/sentCount"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/sender"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/receivers"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.mylyn.reviews.r4e.core.model.ecore#//R4EMeetingData/body"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2012 Ericsson&#xA;&#xA;All rights reserved. This program and the accompanying materials are&#xA;made available under the terms of the Eclipse Public License v1.0 which&#xA;accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Description:&#xA;&#xA;Contributors:&#xA;Alvaro Sanchez-Leon  - Initial API and implementation&#xA;"
+    modelDirectory="/org.eclipse.mylyn.reviews.r4e.core/src" modelPluginID="org.eclipse.mylyn.reviews.r4e.core"
+    modelName="R4e" suppressEMFTypes="true" importerID="org.eclipse.emf.importer.ecore"
+    containmentProxies="true" complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.7"
+    usedGenPackages="drules.genmodel#//drules platform:/plugin/org.eclipse.mylyn.reviews.core/model/reviews.genmodel#//reviews">
+  <foreignModel>r4e.ecore</foreignModel>
+  <genPackages prefix="RModel" basePackage="org.eclipse.mylyn.reviews.r4e.core" resource="XML"
+      disposableProviderFactory="true" dataTypeConverters="true" ecorePackage="r4e.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="r4e.ecore#//R4EAnomalyState">
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EAnomalyState/Created"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EAnomalyState/Assigned"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EAnomalyState/Accepted"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EAnomalyState/Fixed"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EAnomalyState/Duplicated"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EAnomalyState/Rejected"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EAnomalyState/Deferred"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EAnomalyState/Verified"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="r4e.ecore#//R4EReviewPhase">
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EReviewPhase/Started"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EReviewPhase/Preparation"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EReviewPhase/Decision"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EReviewPhase/Rework"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EReviewPhase/Completed"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="r4e.ecore#//R4EUserRole">
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EUserRole/Reviewer"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EUserRole/Lead"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EUserRole/Author"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EUserRole/Organizer"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="r4e.ecore#//R4EDecision">
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EDecision/None"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EDecision/Accepted"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EDecision/AcceptedFollowup"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EDecision/Rejected"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="r4e.ecore#//R4EReviewType">
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EReviewType/Basic"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EReviewType/Informal"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EReviewType/Formal"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="r4e.ecore#//R4EContextType">
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EContextType/Undefined"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EContextType/Added"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EContextType/Deleted"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EContextType/Modified"/>
+      <genEnumLiterals ecoreEnumLiteral="r4e.ecore#//R4EContextType/Replaced"/>
+    </genEnums>
+    <genDataTypes ecoreDataType="r4e.ecore#//IResource"/>
+    <genDataTypes ecoreDataType="r4e.ecore#//URI"/>
+    <genDataTypes ecoreDataType="r4e.ecore#//IFileRevision"/>
+    <genClasses ecoreClass="r4e.ecore#//R4EReviewGroup">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewGroup/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewGroup/folder"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewGroup/defaultEntryCriteria"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewGroup/availableProjects"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewGroup/availableComponents"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewGroup/designRuleLocations"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EReference r4e.ecore#//R4EReviewGroup/availableAnomalyTypes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReviewGroup/anomalyTypeKeyToReference"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReviewGroup/reviewsMap"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReviewGroup/userReviews"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EReview">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/project"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/components"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/entryCriteria"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/extraNotes"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/objectives"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/referenceMaterial"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReview/decision"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/startDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/endDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/dueDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/modifiedDate"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReview/anomalyTemplate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReview/type"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReview/usersMap"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReview/createdBy"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReview/idsMap"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EReview/activeMeeting"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EAnomaly">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/state"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/dueDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/rank"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EAnomaly/rule"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/notAcceptedReason"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/isImported"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EAnomaly/fixedInVersion"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/ruleID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/decidedByID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/fixedByID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomaly/followUpByID"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EFormalReview">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EFormalReview/phaseOwner"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EFormalReview/phases"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EFormalReview/current"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4ETextPosition">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4ETextPosition/startPosition"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4ETextPosition/length"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4ETextPosition/startLine"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4ETextPosition/endLine"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EReviewDecision">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewDecision/spentTime"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewDecision/value"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EUser">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EUser/groupPaths"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EUser/sequenceIDCounter"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EUser/addedComments"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EUser/addedItems"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EUser/reviewCreatedByMe"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EUser/reviewInstance"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EUser/reviewCompleted"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EUser/reviewCompletedCode"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EParticipant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EParticipant/roles"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EParticipant/focusArea"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EParticipant/isPartOfDecision"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EParticipant/reviewedContent"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EParticipant/timeLog"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EItem">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EItem/description"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EItem/addedById"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EItem/fileContextList"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EItem/repositoryRef"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EItem/ProjectURIs"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EItem/authorRep"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EItem/submitted"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EItem/infoAtt"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4ETextContent">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4ETextContent/content"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EID">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EID/sequenceID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EID/userID"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EAnomalyType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EAnomalyType/type"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4ETaskReference"/>
+    <genClasses ecoreClass="r4e.ecore#//R4EReviewState">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewState/state"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EComment">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EComment/createdOn"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EComment/anomaly"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EComment/infoAtt"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EReviewComponent">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewComponent/assignedTo"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EFileContext">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EFileContext/deltas"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EFileContext/base"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EFileContext/target"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EFileContext/type"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EFileContext/infoAtt"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EDelta">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EDelta/base"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EDelta/target"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4ECommentType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4ECommentType/type"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//MapToAnomalyType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//MapToAnomalyType/key"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//MapToAnomalyType/value"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="r4e.ecore#//R4EContent">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EContent/location"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EContent/info"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EPosition"/>
+    <genClasses ecoreClass="r4e.ecore#//R4EFileVersion">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EFileVersion/platformURI"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EFileVersion/versionID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EFileVersion/repositoryPath"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EFileVersion/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EFileVersion/resource"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EFileVersion/localVersionID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EFileVersion/fileRevision"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EFileVersion/infoAtt"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//MapNameToReview">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//MapNameToReview/key"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//MapNameToReview/value"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//MapToUsers">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//MapToUsers/key"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//MapToUsers/value"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EUserReviews">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EUserReviews/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EUserReviews/invitedToMap"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EUserReviews/group"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EUserReviews/createdReviews"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EIDComponent">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EIDComponent/r4eId"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//MapIDToComponent">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//MapIDToComponent/key"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//MapIDToComponent/value"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//MapUserIDToUserReviews">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//MapUserIDToUserReviews/key"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference r4e.ecore#//MapUserIDToUserReviews/value"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EAnomalyTextPosition">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference r4e.ecore#//R4EAnomalyTextPosition/file"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//MapDateToDuration">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//MapDateToDuration/key"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//MapDateToDuration/value"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//MapKeyToInfoAttributes">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//MapKeyToInfoAttributes/key"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//MapKeyToInfoAttributes/value"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EReviewPhaseInfo">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewPhaseInfo/endDate"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewPhaseInfo/type"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewPhaseInfo/phaseOwnerID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EReviewPhaseInfo/startDate"/>
+    </genClasses>
+    <genClasses ecoreClass="r4e.ecore#//R4EMeetingData">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/subject"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/location"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/startTime"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/duration"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/sentCount"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/sender"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/receivers"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute r4e.ecore#//R4EMeetingData/body"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/org.eclipse.mylyn.reviews.r4e.core/plugin.xml b/org.eclipse.mylyn.reviews.r4e.core/plugin.xml
index bfa8156e..126f586d 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/plugin.xml
+++ b/org.eclipse.mylyn.reviews.r4e.core/plugin.xml
@@ -26,4 +26,18 @@
             class="org.eclipse.mylyn.reviews.r4e.core.model.util.RModelResourceFactoryImpl"/>
    </extension>
 
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated drules -->
+      <package
+            uri="http://org.eclipse.mylyn.reviews.r4e.core.model.drules.ecore/1.0"
+            class="org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage"
+            genModel="model/drules.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated drules -->
+      <parser
+            type="drules"
+            class="org.eclipse.mylyn.reviews.r4e.core.model.drules.util.DRModelResourceFactoryImpl"/>
+   </extension>
 </plugin>
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/Activator.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/Activator.java
index c517f52e..ee4ed3a0 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/Activator.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/Activator.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.egit.core.RepositoryCache;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 import org.osgi.framework.BundleContext;
 
 public class Activator extends Plugin {
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomaly.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomaly.java
index 2fc0509a..2cc43469 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomaly.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomaly.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -16,7 +16,7 @@ package org.eclipse.mylyn.reviews.r4e.core.model;
 
 import java.util.Date;
 
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleRank;
 
@@ -44,7 +44,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleRank;
  * @model
  * @generated
  */
-public interface R4EAnomaly extends Topic, R4EReviewComponent, R4EComment {
+public interface R4EAnomaly extends ITopic, R4EReviewComponent, R4EComment {
 	/**
 	 * Returns the value of the '<em><b>State</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyState}.
@@ -323,4 +323,5 @@ public interface R4EAnomaly extends Topic, R4EReviewComponent, R4EComment {
 	 * @generated
 	 */
 	void setFollowUpByID(String value);
+
 } // R4EAnomaly
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyState.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyState.java
index d44cd41e..1967c76a 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyState.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyState.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -29,194 +29,190 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum R4EAnomalyState implements Enumerator {
 	/**
-	 * The '<em><b>R4E ANOMALY STATE CREATED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_CREATED_VALUE
+	 * The '<em><b>Created</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #CREATED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ANOMALY_STATE_CREATED(5, "R4E_ANOMALY_STATE_CREATED", "R4E_ANOMALY_STATE_CREATED"),
-
-	/**
-	 * The '<em><b>R4E ANOMALY STATE ASSIGNED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_ASSIGNED_VALUE
+	CREATED(5, "Created", "CREATED"), /**
+	 * The '<em><b>Assigned</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ASSIGNED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ANOMALY_STATE_ASSIGNED(4, "R4E_ANOMALY_STATE_ASSIGNED", "R4E_ANOMALY_STATE_ASSIGNED"),
-
-	/**
-	 * The '<em><b>R4E ANOMALY STATE ACCEPTED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_ACCEPTED_VALUE
+	ASSIGNED(4, "Assigned", "ASSIGNED"), /**
+	 * The '<em><b>Accepted</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ACCEPTED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ANOMALY_STATE_ACCEPTED(0, "R4E_ANOMALY_STATE_ACCEPTED", "R4E_ANOMALY_STATE_ACCEPTED"),
-
-	/**
-	 * The '<em><b>R4E ANOMALY STATE FIXED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_FIXED_VALUE
+	ACCEPTED(0, "Accepted", "ACCEPTED"), /**
+	 * The '<em><b>Fixed</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #FIXED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ANOMALY_STATE_FIXED(7, "R4E_ANOMALY_STATE_FIXED", "R4E_ANOMALY_STATE_FIXED"),
-
-	/**
-	 * The '<em><b>R4E ANOMALY STATE DUPLICATED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_DUPLICATED_VALUE
+	FIXED(7, "Fixed", "FIXED"), /**
+	 * The '<em><b>Duplicated</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DUPLICATED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ANOMALY_STATE_DUPLICATED(1, "R4E_ANOMALY_STATE_DUPLICATED", "R4E_ANOMALY_STATE_DUPLICATED"),
-
-	/**
-	 * The '<em><b>R4E ANOMALY STATE REJECTED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_REJECTED_VALUE
+	DUPLICATED(1, "Duplicated", "DUPLICATED"), /**
+	 * The '<em><b>Rejected</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #REJECTED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ANOMALY_STATE_REJECTED(2, "R4E_ANOMALY_STATE_REJECTED", "R4E_ANOMALY_STATE_REJECTED"),
-
-	/**
-	 * The '<em><b>R4E ANOMALY STATE DEFERRED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_DEFERRED_VALUE
+	REJECTED(2, "Rejected", "REJECTED"), /**
+	 * The '<em><b>Deferred</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DEFERRED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ANOMALY_STATE_DEFERRED(3, "R4E_ANOMALY_STATE_DEFERRED", "R4E_ANOMALY_STATE_DEFERRED"), /**
-	 * The '<em><b>R4E ANOMALY STATE VERIFIED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_VERIFIED_VALUE
+	DEFERRED(3, "Deferred", "DEFERRED"), /**
+	 * The '<em><b>Verified</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #VERIFIED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ANOMALY_STATE_VERIFIED(6, "R4E_ANOMALY_STATE_VERIFIED", "R4E_ANOMALY_STATE_VERIFIED");
+	VERIFIED(6, "Verified", "VERIFIED");
 
 	/**
-	 * The '<em><b>R4E ANOMALY STATE CREATED</b></em>' literal value.
+	 * The '<em><b>Created</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ANOMALY STATE CREATED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Created</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_CREATED
-	 * @model
+	 * @see #CREATED
+	 * @model name="Created" literal="CREATED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ANOMALY_STATE_CREATED_VALUE = 5;
+	public static final int CREATED_VALUE = 5;
 
 	/**
-	 * The '<em><b>R4E ANOMALY STATE ASSIGNED</b></em>' literal value.
+	 * The '<em><b>Assigned</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ANOMALY STATE ASSIGNED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Assigned</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_ASSIGNED
-	 * @model
+	 * @see #ASSIGNED
+	 * @model name="Assigned" literal="ASSIGNED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ANOMALY_STATE_ASSIGNED_VALUE = 4;
+	public static final int ASSIGNED_VALUE = 4;
 
 	/**
-	 * The '<em><b>R4E ANOMALY STATE ACCEPTED</b></em>' literal value.
+	 * The '<em><b>Accepted</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ANOMALY STATE ACCEPTED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Accepted</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_ACCEPTED
-	 * @model
+	 * @see #ACCEPTED
+	 * @model name="Accepted" literal="ACCEPTED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ANOMALY_STATE_ACCEPTED_VALUE = 0;
+	public static final int ACCEPTED_VALUE = 0;
 
 	/**
-	 * The '<em><b>R4E ANOMALY STATE FIXED</b></em>' literal value.
+	 * The '<em><b>Fixed</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ANOMALY STATE FIXED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Fixed</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_FIXED
-	 * @model
+	 * @see #FIXED
+	 * @model name="Fixed" literal="FIXED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ANOMALY_STATE_FIXED_VALUE = 7;
+	public static final int FIXED_VALUE = 7;
 
 	/**
-	 * The '<em><b>R4E ANOMALY STATE DUPLICATED</b></em>' literal value.
+	 * The '<em><b>Duplicated</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ANOMALY STATE DUPLICATED</b></em>' literal object isn't clear, there really should
-	 * be more of a description here...
+	 * If the meaning of '<em><b>Duplicated</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_DUPLICATED
-	 * @model
+	 * @see #DUPLICATED
+	 * @model name="Duplicated" literal="DUPLICATED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ANOMALY_STATE_DUPLICATED_VALUE = 1;
+	public static final int DUPLICATED_VALUE = 1;
 
 	/**
-	 * The '<em><b>R4E ANOMALY STATE REJECTED</b></em>' literal value.
+	 * The '<em><b>Rejected</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ANOMALY STATE REJECTED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Rejected</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_REJECTED
-	 * @model
+	 * @see #REJECTED
+	 * @model name="Rejected" literal="REJECTED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ANOMALY_STATE_REJECTED_VALUE = 2;
+	public static final int REJECTED_VALUE = 2;
 
 	/**
-	 * The '<em><b>R4E ANOMALY STATE DEFERRED</b></em>' literal value.
+	 * The '<em><b>Deferred</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ANOMALY STATE DEFERRED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Deferred</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_DEFERRED
-	 * @model
+	 * @see #DEFERRED
+	 * @model name="Deferred" literal="DEFERRED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ANOMALY_STATE_DEFERRED_VALUE = 3;
+	public static final int DEFERRED_VALUE = 3;
 
 	/**
-	 * The '<em><b>R4E ANOMALY STATE VERIFIED</b></em>' literal value.
+	 * The '<em><b>Verified</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ANOMALY STATE VERIFIED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Verified</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ANOMALY_STATE_VERIFIED
-	 * @model
+	 * @see #VERIFIED
+	 * @model name="Verified" literal="VERIFIED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ANOMALY_STATE_VERIFIED_VALUE = 6;
+	public static final int VERIFIED_VALUE = 6;
 
 	/**
 	 * An array of all the '<em><b>R4E Anomaly State</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc
@@ -225,14 +221,14 @@ public enum R4EAnomalyState implements Enumerator {
 	 * @generated
 	 */
 	private static final R4EAnomalyState[] VALUES_ARRAY = new R4EAnomalyState[] {
-			R4E_ANOMALY_STATE_CREATED,
-			R4E_ANOMALY_STATE_ASSIGNED,
-			R4E_ANOMALY_STATE_ACCEPTED,
-			R4E_ANOMALY_STATE_FIXED,
-			R4E_ANOMALY_STATE_DUPLICATED,
-			R4E_ANOMALY_STATE_REJECTED,
-			R4E_ANOMALY_STATE_DEFERRED,
-			R4E_ANOMALY_STATE_VERIFIED,
+			CREATED,
+			ASSIGNED,
+			ACCEPTED,
+			FIXED,
+			DUPLICATED,
+			REJECTED,
+			DEFERRED,
+			VERIFIED,
 		};
 
 	/**
@@ -283,14 +279,14 @@ public enum R4EAnomalyState implements Enumerator {
 	 */
 	public static R4EAnomalyState get(int value) {
 		switch (value) {
-			case R4E_ANOMALY_STATE_CREATED_VALUE: return R4E_ANOMALY_STATE_CREATED;
-			case R4E_ANOMALY_STATE_ASSIGNED_VALUE: return R4E_ANOMALY_STATE_ASSIGNED;
-			case R4E_ANOMALY_STATE_ACCEPTED_VALUE: return R4E_ANOMALY_STATE_ACCEPTED;
-			case R4E_ANOMALY_STATE_FIXED_VALUE: return R4E_ANOMALY_STATE_FIXED;
-			case R4E_ANOMALY_STATE_DUPLICATED_VALUE: return R4E_ANOMALY_STATE_DUPLICATED;
-			case R4E_ANOMALY_STATE_REJECTED_VALUE: return R4E_ANOMALY_STATE_REJECTED;
-			case R4E_ANOMALY_STATE_DEFERRED_VALUE: return R4E_ANOMALY_STATE_DEFERRED;
-			case R4E_ANOMALY_STATE_VERIFIED_VALUE: return R4E_ANOMALY_STATE_VERIFIED;
+			case CREATED_VALUE: return CREATED;
+			case ASSIGNED_VALUE: return ASSIGNED;
+			case ACCEPTED_VALUE: return ACCEPTED;
+			case FIXED_VALUE: return FIXED;
+			case DUPLICATED_VALUE: return DUPLICATED;
+			case REJECTED_VALUE: return REJECTED;
+			case DEFERRED_VALUE: return DEFERRED;
+			case VERIFIED_VALUE: return VERIFIED;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyTextPosition.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyTextPosition.java
index bd1864ee..6d289401 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyTextPosition.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyTextPosition.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyType.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyType.java
index 0866c4d8..2240e00c 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyType.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EAnomalyType.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,7 +14,7 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
+import org.eclipse.mylyn.reviews.core.model.ICommentType;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Anomaly Type</b></em>'. <!-- end-user-doc
@@ -30,7 +30,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
  * @model
  * @generated
  */
-public interface R4EAnomalyType extends CommentType {
+public interface R4EAnomalyType extends ICommentType {
 	/**
 	 * Returns the value of the '<em><b>Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EComment.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EComment.java
index abf09081..85676e94 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EComment.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EComment.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,9 +15,9 @@
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
 import java.util.Date;
+import java.util.Map;
 
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
+import org.eclipse.mylyn.reviews.core.model.IComment;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Comment</b></em>'. <!-- end-user-doc -->
@@ -35,8 +35,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.Comment;
  * @model
  * @generated
  */
-public interface R4EComment extends Comment, R4EReviewComponent, R4EIDComponent {
-
+public interface R4EComment extends IComment, R4EReviewComponent, R4EIDComponent {
 	/**
 	 * Returns the value of the '<em><b>Created On</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -101,5 +100,6 @@ public interface R4EComment extends Comment, R4EReviewComponent, R4EIDComponent
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapKeyToInfoAttributes<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
 	 * @generated
 	 */
-	EMap<String, String> getInfoAtt();
+	Map<String, String> getInfoAtt();
+
 } // R4EComment
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ECommentType.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ECommentType.java
index c985c876..7fa301c1 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ECommentType.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ECommentType.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,7 +14,7 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
+import org.eclipse.mylyn.reviews.core.model.ICommentType;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleClass;
 
 /**
@@ -31,7 +31,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleClass;
  * @model
  * @generated
  */
-public interface R4ECommentType extends CommentType {
+public interface R4ECommentType extends ICommentType {
 	/**
 	 * Returns the value of the '<em><b>Type</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleClass}.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EContent.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EContent.java
index ebf408df..600870ae 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EContent.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EContent.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,7 +14,7 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
+import org.eclipse.mylyn.reviews.core.model.ILocation;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Content</b></em>'. <!-- end-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.Location;
  * @model abstract="true"
  * @generated
  */
-public interface R4EContent extends Location {
+public interface R4EContent extends ILocation {
 	/**
 	 * Returns the value of the '<em><b>Location</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EContextType.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EContextType.java
index 94903e42..adba606e 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EContextType.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EContextType.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -29,124 +29,121 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum R4EContextType implements Enumerator {
 	/**
-	 * The '<em><b>R4E UNDEFINED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_UNDEFINED_VALUE
+	 * The '<em><b>Undefined</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #UNDEFINED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_UNDEFINED(4, "R4E_UNDEFINED", "R4E_UNDEFINED"),
-
-	/**
-	 * The '<em><b>R4E ADDED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ADDED_VALUE
+	UNDEFINED(4, "Undefined", "UNDEFINED"), /**
+	 * The '<em><b>Added</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ADDED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ADDED(0, "R4E_ADDED", "R4E_ADDED"),
-
-	/**
-	 * The '<em><b>R4E DELETED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_DELETED_VALUE
+	ADDED(0, "Added", "ADDED"), /**
+	 * The '<em><b>Deleted</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DELETED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_DELETED(1, "R4E_DELETED", "R4E_DELETED"),
-
-	/**
-	 * The '<em><b>R4E MODIFIED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_MODIFIED_VALUE
+	DELETED(1, "Deleted", "DELETED"), /**
+	 * The '<em><b>Modified</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MODIFIED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_MODIFIED(2, "R4E_MODIFIED", "R4E_MODIFIED"),
-
-	/**
-	 * The '<em><b>R4E REPLACED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REPLACED_VALUE
+	MODIFIED(2, "Modified", "MODIFIED"), /**
+	 * The '<em><b>Replaced</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #REPLACED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REPLACED(3, "R4E_REPLACED", "R4E_REPLACED");
+	REPLACED(3, "Replaced", "REPLACED");
 
 	/**
-	 * The '<em><b>R4E UNDEFINED</b></em>' literal value.
+	 * The '<em><b>Undefined</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E UNDEFINED</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Undefined</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_UNDEFINED
-	 * @model
+	 * @see #UNDEFINED
+	 * @model name="Undefined" literal="UNDEFINED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_UNDEFINED_VALUE = 4;
+	public static final int UNDEFINED_VALUE = 4;
 
 	/**
-	 * The '<em><b>R4E ADDED</b></em>' literal value.
+	 * The '<em><b>Added</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ADDED</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Added</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ADDED
-	 * @model
+	 * @see #ADDED
+	 * @model name="Added" literal="ADDED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ADDED_VALUE = 0;
+	public static final int ADDED_VALUE = 0;
 
 	/**
-	 * The '<em><b>R4E DELETED</b></em>' literal value.
+	 * The '<em><b>Deleted</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E DELETED</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Deleted</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_DELETED
-	 * @model
+	 * @see #DELETED
+	 * @model name="Deleted" literal="DELETED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_DELETED_VALUE = 1;
+	public static final int DELETED_VALUE = 1;
 
 	/**
-	 * The '<em><b>R4E MODIFIED</b></em>' literal value.
+	 * The '<em><b>Modified</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E MODIFIED</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Modified</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_MODIFIED
-	 * @model
+	 * @see #MODIFIED
+	 * @model name="Modified" literal="MODIFIED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_MODIFIED_VALUE = 2;
+	public static final int MODIFIED_VALUE = 2;
 
 	/**
-	 * The '<em><b>R4E REPLACED</b></em>' literal value.
+	 * The '<em><b>Replaced</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REPLACED</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Replaced</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REPLACED
-	 * @model
+	 * @see #REPLACED
+	 * @model name="Replaced" literal="REPLACED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REPLACED_VALUE = 3;
+	public static final int REPLACED_VALUE = 3;
 
 	/**
 	 * An array of all the '<em><b>R4E Context Type</b></em>' enumerators.
@@ -154,11 +151,11 @@ public enum R4EContextType implements Enumerator {
 	 * @generated
 	 */
 	private static final R4EContextType[] VALUES_ARRAY = new R4EContextType[] {
-			R4E_UNDEFINED,
-			R4E_ADDED,
-			R4E_DELETED,
-			R4E_MODIFIED,
-			R4E_REPLACED,
+			UNDEFINED,
+			ADDED,
+			DELETED,
+			MODIFIED,
+			REPLACED,
 		};
 
 	/**
@@ -209,11 +206,11 @@ public enum R4EContextType implements Enumerator {
 	 */
 	public static R4EContextType get(int value) {
 		switch (value) {
-			case R4E_UNDEFINED_VALUE: return R4E_UNDEFINED;
-			case R4E_ADDED_VALUE: return R4E_ADDED;
-			case R4E_DELETED_VALUE: return R4E_DELETED;
-			case R4E_MODIFIED_VALUE: return R4E_MODIFIED;
-			case R4E_REPLACED_VALUE: return R4E_REPLACED;
+			case UNDEFINED_VALUE: return UNDEFINED;
+			case ADDED_VALUE: return ADDED;
+			case DELETED_VALUE: return DELETED;
+			case MODIFIED_VALUE: return MODIFIED;
+			case REPLACED_VALUE: return REPLACED;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EDecision.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EDecision.java
index 5ceb2202..c234c1e7 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EDecision.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EDecision.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -29,102 +29,98 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum R4EDecision implements Enumerator {
 	/**
-	 * The '<em><b>R4E REVIEW DECISION NONE</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_DECISION_NONE_VALUE
+	 * The '<em><b>None</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_DECISION_NONE(0, "R4E_REVIEW_DECISION_NONE", "R4E_REVIEW_DECISION_NONE"),
-
-	/**
-	 * The '<em><b>R4E REVIEW DECISION ACCEPTED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_DECISION_ACCEPTED_VALUE
+	NONE(0, "None", "NONE"), /**
+	 * The '<em><b>Accepted</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ACCEPTED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_DECISION_ACCEPTED(1, "R4E_REVIEW_DECISION_ACCEPTED", "R4E_REVIEW_DECISION_ACCEPTED"),
-
-	/**
-	 * The '<em><b>R4E REVIEW DECISION ACCEPTED FOLLOWUP</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @see #R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP_VALUE
+	ACCEPTED(1, "Accepted", "ACCEPTED"), /**
+	 * The '<em><b>Accepted Followup</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ACCEPTED_FOLLOWUP_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP(2, "R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP",
-			"R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP"),
-
-	/**
-	 * The '<em><b>R4E REVIEW DECISION REJECTED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_DECISION_REJECTED_VALUE
+	ACCEPTED_FOLLOWUP(2, "AcceptedFollowup", "FOLLOWUP"), /**
+	 * The '<em><b>Rejected</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #REJECTED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_DECISION_REJECTED(3, "R4E_REVIEW_DECISION_REJECTED", "R4E_REVIEW_DECISION_REJECTED");
+	REJECTED(3, "Rejected", "REJECTED");
 
 	/**
-	 * The '<em><b>R4E REVIEW DECISION NONE</b></em>' literal value.
+	 * The '<em><b>None</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW DECISION NONE</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_DECISION_NONE
-	 * @model
+	 * @see #NONE
+	 * @model name="None" literal="NONE"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_DECISION_NONE_VALUE = 0;
+	public static final int NONE_VALUE = 0;
 
 	/**
-	 * The '<em><b>R4E REVIEW DECISION ACCEPTED</b></em>' literal value.
+	 * The '<em><b>Accepted</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW DECISION ACCEPTED</b></em>' literal object isn't clear, there really should
-	 * be more of a description here...
+	 * If the meaning of '<em><b>Accepted</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_DECISION_ACCEPTED
-	 * @model
+	 * @see #ACCEPTED
+	 * @model name="Accepted" literal="ACCEPTED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_DECISION_ACCEPTED_VALUE = 1;
+	public static final int ACCEPTED_VALUE = 1;
 
 	/**
-	 * The '<em><b>R4E REVIEW DECISION ACCEPTED FOLLOWUP</b></em>' literal value.
+	 * The '<em><b>Accepted Followup</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW DECISION ACCEPTED FOLLOWUP</b></em>' literal object isn't clear, there
-	 * really should be more of a description here...
+	 * If the meaning of '<em><b>Accepted Followup</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP
-	 * @model
+	 * @see #ACCEPTED_FOLLOWUP
+	 * @model name="AcceptedFollowup" literal="FOLLOWUP"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP_VALUE = 2;
+	public static final int ACCEPTED_FOLLOWUP_VALUE = 2;
 
 	/**
-	 * The '<em><b>R4E REVIEW DECISION REJECTED</b></em>' literal value.
+	 * The '<em><b>Rejected</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW DECISION REJECTED</b></em>' literal object isn't clear, there really should
-	 * be more of a description here...
+	 * If the meaning of '<em><b>Rejected</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_DECISION_REJECTED
-	 * @model
+	 * @see #REJECTED
+	 * @model name="Rejected" literal="REJECTED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_DECISION_REJECTED_VALUE = 3;
+	public static final int REJECTED_VALUE = 3;
 
 	/**
 	 * An array of all the '<em><b>R4E Decision</b></em>' enumerators.
@@ -132,10 +128,10 @@ public enum R4EDecision implements Enumerator {
 	 * @generated
 	 */
 	private static final R4EDecision[] VALUES_ARRAY = new R4EDecision[] {
-			R4E_REVIEW_DECISION_NONE,
-			R4E_REVIEW_DECISION_ACCEPTED,
-			R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP,
-			R4E_REVIEW_DECISION_REJECTED,
+			NONE,
+			ACCEPTED,
+			ACCEPTED_FOLLOWUP,
+			REJECTED,
 		};
 
 	/**
@@ -186,10 +182,10 @@ public enum R4EDecision implements Enumerator {
 	 */
 	public static R4EDecision get(int value) {
 		switch (value) {
-			case R4E_REVIEW_DECISION_NONE_VALUE: return R4E_REVIEW_DECISION_NONE;
-			case R4E_REVIEW_DECISION_ACCEPTED_VALUE: return R4E_REVIEW_DECISION_ACCEPTED;
-			case R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP_VALUE: return R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP;
-			case R4E_REVIEW_DECISION_REJECTED_VALUE: return R4E_REVIEW_DECISION_REJECTED;
+			case NONE_VALUE: return NONE;
+			case ACCEPTED_VALUE: return ACCEPTED;
+			case ACCEPTED_FOLLOWUP_VALUE: return ACCEPTED_FOLLOWUP;
+			case REJECTED_VALUE: return REJECTED;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EDelta.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EDelta.java
index 0f5d9df4..65acf519 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EDelta.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EDelta.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -30,7 +30,6 @@ package org.eclipse.mylyn.reviews.r4e.core.model;
  * @generated
  */
 public interface R4EDelta extends R4EIDComponent {
-
 	/**
 	 * Returns the value of the '<em><b>Base</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -80,4 +79,5 @@ public interface R4EDelta extends R4EIDComponent {
 	 * @generated
 	 */
 	void setTarget(R4EContent value);
+
 } // R4EDelta
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFileContext.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFileContext.java
index 29e1a359..f483dae4 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFileContext.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFileContext.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,8 +14,8 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E File Context</b></em>'. <!-- end-user-doc
@@ -36,7 +36,6 @@ import org.eclipse.emf.common.util.EMap;
  * @generated
  */
 public interface R4EFileContext extends R4EIDComponent {
-
 	/**
 	 * Returns the value of the '<em><b>Deltas</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.mylyn.reviews.r4e.core.model.R4EDelta}.
@@ -51,13 +50,14 @@ public interface R4EFileContext extends R4EIDComponent {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EDelta> getDeltas();
+	List<R4EDelta> getDeltas();
 
 	/**
 	 * Returns the value of the '<em><b>Base</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Base</em>' reference isn't clear, there really should be more of a description here...
+	 * If the meaning of the '<em>Base</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Base</em>' containment reference.
@@ -81,8 +81,8 @@ public interface R4EFileContext extends R4EIDComponent {
 	 * Returns the value of the '<em><b>Target</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Target</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Target</em>' containment reference.
@@ -143,5 +143,6 @@ public interface R4EFileContext extends R4EIDComponent {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapKeyToInfoAttributes<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
 	 * @generated
 	 */
-	EMap<String, String> getInfoAtt();
+	Map<String, String> getInfoAtt();
+
 } // R4EFileContext
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFileVersion.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFileVersion.java
index df7050c0..b04fb4eb 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFileVersion.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFileVersion.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,11 +14,10 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.core.resources.IResource;
+import java.util.Map;
 
-import org.eclipse.emf.common.util.EMap;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.team.core.history.IFileRevision;
 
 /**
@@ -233,6 +232,6 @@ public interface R4EFileVersion extends EObject {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapKeyToInfoAttributes<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
 	 * @generated
 	 */
-	EMap<String, String> getInfoAtt();
+	Map<String, String> getInfoAtt();
 
 } // R4EFileVersion
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFormalReview.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFormalReview.java
index 209239f7..ed830261 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFormalReview.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EFormalReview.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,7 +14,7 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Formal Review</b></em>'. <!-- end-user-doc
@@ -72,7 +72,7 @@ public interface R4EFormalReview extends R4EReview {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EReviewPhaseInfo> getPhases();
+	List<R4EReviewPhaseInfo> getPhases();
 
 	/**
 	 * Returns the value of the '<em><b>Current</b></em>' reference.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EID.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EID.java
index d1bb84da..803b5f4b 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EID.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EID.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EIDComponent.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EIDComponent.java
index d9e88e71..403b907a 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EIDComponent.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EIDComponent.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -20,7 +20,7 @@ package org.eclipse.mylyn.reviews.r4e.core.model;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent#getR4eId <em>R4e Id</em>}</li>
  * </ul>
  * </p>
  *
@@ -30,28 +30,28 @@ package org.eclipse.mylyn.reviews.r4e.core.model;
  */
 public interface R4EIDComponent extends R4EReviewComponent {
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' containment reference.
+	 * Returns the value of the '<em><b>R4e Id</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Id</em>' containment reference isn't clear, there really should be more of a
+	 * If the meaning of the '<em>R4e Id</em>' containment reference isn't clear, there really should be more of a
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' containment reference.
-	 * @see #setId(R4EID)
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage#getR4EIDComponent_Id()
+	 * @return the value of the '<em>R4e Id</em>' containment reference.
+	 * @see #setR4eId(R4EID)
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage#getR4EIDComponent_R4eId()
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	R4EID getId();
+	R4EID getR4eId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent#getId <em>Id</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent#getR4eId <em>R4e Id</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' containment reference.
-	 * @see #getId()
+	 * @param value the new value of the '<em>R4e Id</em>' containment reference.
+	 * @see #getR4eId()
 	 * @generated
 	 */
-	void setId(R4EID value);
+	void setR4eId(R4EID value);
 
 } // R4EIDComponent
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EItem.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EItem.java
index cc564fa7..ba7b8f68 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EItem.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EItem.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,10 +15,10 @@
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
 import java.util.Date;
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
+import java.util.Map;
 
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
+import org.eclipse.mylyn.reviews.core.model.IReviewItem;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Item</b></em>'. <!-- end-user-doc -->
@@ -41,7 +41,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.Item;
  * @model
  * @generated
  */
-public interface R4EItem extends R4EIDComponent, Item {
+public interface R4EItem extends R4EIDComponent, IReviewItem {
 	/**
 	 * Returns the value of the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -106,7 +106,7 @@ public interface R4EItem extends R4EIDComponent, Item {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EFileContext> getFileContextList();
+	List<R4EFileContext> getFileContextList();
 
 	/**
 	 * Returns the value of the '<em><b>Repository Ref</b></em>' attribute.
@@ -147,7 +147,7 @@ public interface R4EItem extends R4EIDComponent, Item {
 	 * @model
 	 * @generated
 	 */
-	EList<String> getProjectURIs();
+	List<String> getProjectURIs();
 
 	/**
 	 * Returns the value of the '<em><b>Author Rep</b></em>' attribute.
@@ -213,6 +213,6 @@ public interface R4EItem extends R4EIDComponent, Item {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapKeyToInfoAttributes<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
 	 * @generated
 	 */
-	EMap<String, String> getInfoAtt();
+	Map<String, String> getInfoAtt();
 
 } // R4EItem
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EMeetingData.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EMeetingData.java
index c55356ca..c60efdd2 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EMeetingData.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EMeetingData.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,7 +14,8 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -228,7 +229,7 @@ public interface R4EMeetingData extends EObject {
 	 * @model
 	 * @generated
 	 */
-	EList<String> getReceivers();
+	List<String> getReceivers();
 
 	/**
 	 * Returns the value of the '<em><b>Body</b></em>' attribute.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EParticipant.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EParticipant.java
index 1a52b28c..36055ba0 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EParticipant.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EParticipant.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,8 +15,8 @@
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
 import java.util.Date;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Participant</b></em>'. <!-- end-user-doc -->
@@ -53,7 +53,7 @@ public interface R4EParticipant extends R4EUser {
 	 * @model
 	 * @generated
 	 */
-	EList<R4EUserRole> getRoles();
+	List<R4EUserRole> getRoles();
 
 	/**
 	 * Returns the value of the '<em><b>Focus Area</b></em>' attribute.
@@ -110,8 +110,8 @@ public interface R4EParticipant extends R4EUser {
 	 * The list contents are of type {@link org.eclipse.mylyn.reviews.r4e.core.model.R4EID}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Reviewed Content</em>' containment reference list isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of the '<em>Reviewed Content</em>' reference list isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Reviewed Content</em>' reference list.
@@ -119,7 +119,7 @@ public interface R4EParticipant extends R4EUser {
 	 * @model
 	 * @generated
 	 */
-	EList<R4EID> getReviewedContent();
+	List<R4EID> getReviewedContent();
 
 	/**
 	 * Returns the value of the '<em><b>Time Log</b></em>' map.
@@ -135,6 +135,6 @@ public interface R4EParticipant extends R4EUser {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapDateToDuration<org.eclipse.emf.ecore.EDate, org.eclipse.emf.ecore.EIntegerObject>"
 	 * @generated
 	 */
-	EMap<Date, Integer> getTimeLog();
+	Map<Date, Integer> getTimeLog();
 
 } // R4EParticipant
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EPosition.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EPosition.java
index 3b6e6494..4539673c 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EPosition.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EPosition.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReview.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReview.java
index d8ec3ffc..67851236 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReview.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReview.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,10 +15,11 @@
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.core.model.IReview;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Review</b></em>'. <!-- end-user-doc -->
@@ -37,6 +38,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.Review;
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getStartDate <em>Start Date</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getEndDate <em>End Date</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getDueDate <em>Due Date</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getModifiedDate <em>Modified Date</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getAnomalyTemplate <em>Anomaly Template</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getUsersMap <em>Users Map</em>}</li>
@@ -50,7 +52,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.Review;
  * @model
  * @generated
  */
-public interface R4EReview extends Review, R4EReviewComponent {
+public interface R4EReview extends IReview, R4EReviewComponent, IModelVersioning {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -114,7 +116,7 @@ public interface R4EReview extends Review, R4EReviewComponent {
 	 * @model
 	 * @generated
 	 */
-	EList<String> getComponents();
+	List<String> getComponents();
 
 	/**
 	 * Returns the value of the '<em><b>Entry Criteria</b></em>' attribute.
@@ -220,8 +222,8 @@ public interface R4EReview extends Review, R4EReviewComponent {
 	 * Returns the value of the '<em><b>Decision</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Decision</em>' reference isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Decision</em>' containment reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Decision</em>' containment reference.
@@ -317,11 +319,37 @@ public interface R4EReview extends Review, R4EReviewComponent {
 	void setDueDate(Date value);
 
 	/**
+	 * Returns the value of the '<em><b>Modified Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Modified Date</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Modified Date</em>' attribute.
+	 * @see #setModifiedDate(Date)
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage#getR4EReview_ModifiedDate()
+	 * @model
+	 * @generated
+	 */
+	Date getModifiedDate();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getModifiedDate <em>Modified Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Modified Date</em>' attribute.
+	 * @see #getModifiedDate()
+	 * @generated
+	 */
+	void setModifiedDate(Date value);
+
+	/**
 	 * Returns the value of the '<em><b>Anomaly Template</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Anomaly Template</em>' reference isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of the '<em>Anomaly Template</em>' containment reference isn't clear, there really should be more
+	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Anomaly Template</em>' containment reference.
@@ -383,7 +411,32 @@ public interface R4EReview extends Review, R4EReviewComponent {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapToUsers<org.eclipse.emf.ecore.EString, org.eclipse.mylyn.reviews.r4e.core.model.R4EUser>" transient="true" derived="true"
 	 * @generated
 	 */
-	EMap<String, R4EUser> getUsersMap();
+	Map<String, R4EUser> getUsersMap();
+
+	/**
+	 * Returns the value of the '<em><b>Created By</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Created By</em>' reference isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Created By</em>' reference.
+	 * @see #setCreatedBy(R4EUser)
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage#getR4EReview_CreatedBy()
+	 * @model required="true"
+	 * @generated
+	 */
+	R4EUser getCreatedBy();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getCreatedBy <em>Created By</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Created By</em>' reference.
+	 * @see #getCreatedBy()
+	 * @generated
+	 */
+	void setCreatedBy(R4EUser value);
 
 	/**
 	 * Returns the value of the '<em><b>Ids Map</b></em>' map.
@@ -391,8 +444,7 @@ public interface R4EReview extends Review, R4EReviewComponent {
 	 * and the value is of type {@link org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent},
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ids Map</em>' reference list isn't clear, there really should be more of a description
-	 * here...
+	 * If the meaning of the '<em>Ids Map</em>' map isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Ids Map</em>' map.
@@ -400,7 +452,7 @@ public interface R4EReview extends Review, R4EReviewComponent {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapIDToComponent<org.eclipse.mylyn.reviews.r4e.core.model.R4EID, org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent>" transient="true" derived="true"
 	 * @generated
 	 */
-	EMap<R4EID, R4EIDComponent> getIdsMap();
+	Map<R4EID, R4EIDComponent> getIdsMap();
 
 	/**
 	 * Returns the value of the '<em><b>Active Meeting</b></em>' containment reference.
@@ -427,29 +479,4 @@ public interface R4EReview extends Review, R4EReviewComponent {
 	 */
 	void setActiveMeeting(R4EMeetingData value);
 
-	/**
-	 * Returns the value of the '<em><b>Created By</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Created By</em>' reference isn't clear, there really should be more of a description
-	 * here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Created By</em>' reference.
-	 * @see #setCreatedBy(R4EUser)
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage#getR4EReview_CreatedBy()
-	 * @model required="true"
-	 * @generated
-	 */
-	R4EUser getCreatedBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getCreatedBy <em>Created By</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Created By</em>' reference.
-	 * @see #getCreatedBy()
-	 * @generated
-	 */
-	void setCreatedBy(R4EUser value);
-
 } // R4EReview
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewComponent.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewComponent.java
index 1bf02ffa..e510a956 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewComponent.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewComponent.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,8 +14,9 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import java.util.List;
+
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Review Component</b></em>'. <!--
@@ -32,8 +33,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
  * @model
  * @generated
  */
-public interface R4EReviewComponent extends ReviewComponent {
-
+public interface R4EReviewComponent extends IReviewComponent {
 	/**
 	 * Returns the value of the '<em><b>Assigned To</b></em>' attribute list.
 	 * The list contents are of type {@link java.lang.String}.
@@ -48,6 +48,6 @@ public interface R4EReviewComponent extends ReviewComponent {
 	 * @model
 	 * @generated
 	 */
-	EList<String> getAssignedTo();
+	List<String> getAssignedTo();
 
 } // R4EReviewComponent
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewDecision.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewDecision.java
index a540ea0a..5e5f1ee9 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewDecision.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewDecision.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewGroup.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewGroup.java
index 0aa0db50..059ffb55 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewGroup.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewGroup.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,9 +14,11 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.core.model.IReviewGroup;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Review Group</b></em>'. <!-- end-user-doc
@@ -46,7 +48,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
  * @model extendedMetaData="name='R4EReviewGroup'"
  * @generated
  */
-public interface R4EReviewGroup extends ReviewGroup, R4EReviewComponent {
+public interface R4EReviewGroup extends IReviewGroup, R4EReviewComponent, IModelVersioning {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -135,7 +137,7 @@ public interface R4EReviewGroup extends ReviewGroup, R4EReviewComponent {
 	 * @model
 	 * @generated
 	 */
-	EList<String> getAvailableProjects();
+	List<String> getAvailableProjects();
 
 	/**
 	 * Returns the value of the '<em><b>Available Components</b></em>' attribute list.
@@ -151,7 +153,7 @@ public interface R4EReviewGroup extends ReviewGroup, R4EReviewComponent {
 	 * @model
 	 * @generated
 	 */
-	EList<String> getAvailableComponents();
+	List<String> getAvailableComponents();
 
 	/**
 	 * Returns the value of the '<em><b>Design Rule Locations</b></em>' attribute list.
@@ -167,15 +169,15 @@ public interface R4EReviewGroup extends ReviewGroup, R4EReviewComponent {
 	 * @model
 	 * @generated
 	 */
-	EList<String> getDesignRuleLocations();
+	List<String> getDesignRuleLocations();
 
 	/**
 	 * Returns the value of the '<em><b>Available Anomaly Types</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Available Anomaly Types</em>' attribute list isn't clear, there really should be more
-	 * of a description here...
+	 * If the meaning of the '<em>Available Anomaly Types</em>' containment reference list isn't clear, there really
+	 * should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Available Anomaly Types</em>' containment reference list.
@@ -183,7 +185,7 @@ public interface R4EReviewGroup extends ReviewGroup, R4EReviewComponent {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EAnomalyType> getAvailableAnomalyTypes();
+	List<R4EAnomalyType> getAvailableAnomalyTypes();
 
 	/**
 	 * Returns the value of the '<em><b>Anomaly Type Key To Reference</b></em>' map.
@@ -200,7 +202,7 @@ public interface R4EReviewGroup extends ReviewGroup, R4EReviewComponent {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapToAnomalyType<org.eclipse.emf.ecore.EString, org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyType>" transient="true" derived="true"
 	 * @generated
 	 */
-	EMap<String, R4EAnomalyType> getAnomalyTypeKeyToReference();
+	Map<String, R4EAnomalyType> getAnomalyTypeKeyToReference();
 
 	/**
 	 * Returns the value of the '<em><b>Reviews Map</b></em>' map.
@@ -217,7 +219,7 @@ public interface R4EReviewGroup extends ReviewGroup, R4EReviewComponent {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapNameToReview<org.eclipse.emf.ecore.EString, org.eclipse.mylyn.reviews.r4e.core.model.R4EReview>" transient="true" derived="true"
 	 * @generated
 	 */
-	EMap<String, R4EReview> getReviewsMap();
+	Map<String, R4EReview> getReviewsMap();
 
 	/**
 	 * Returns the value of the '<em><b>User Reviews</b></em>' map.
@@ -234,6 +236,6 @@ public interface R4EReviewGroup extends ReviewGroup, R4EReviewComponent {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapUserIDToUserReviews<org.eclipse.emf.ecore.EString, org.eclipse.mylyn.reviews.r4e.core.model.R4EUserReviews>" transient="true" derived="true"
 	 * @generated
 	 */
-	EMap<String, R4EUserReviews> getUserReviews();
+	Map<String, R4EUserReviews> getUserReviews();
 
 } // R4EReviewGroup
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewPhase.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewPhase.java
index 57239ec2..0f4fa160 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewPhase.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewPhase.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -29,124 +29,121 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum R4EReviewPhase implements Enumerator {
 	/**
-	 * The '<em><b>R4E REVIEW PHASE STARTED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_STARTED_VALUE
+	 * The '<em><b>Started</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #STARTED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_PHASE_STARTED(0, "R4E_REVIEW_PHASE_STARTED", "R4E_REVIEW_PHASE_STARTED"),
-
-	/**
-	 * The '<em><b>R4E REVIEW PHASE PREPARATION</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_PREPARATION_VALUE
+	STARTED(0, "Started", "STARTED"), /**
+	 * The '<em><b>Preparation</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PREPARATION_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_PHASE_PREPARATION(1, "R4E_REVIEW_PHASE_PREPARATION", "R4E_REVIEW_PHASE_PREPARATION"),
-
-	/**
-	 * The '<em><b>R4E REVIEW PHASE DECISION</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_DECISION_VALUE
+	PREPARATION(1, "Preparation", "PREPARATION"), /**
+	 * The '<em><b>Decision</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DECISION_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_PHASE_DECISION(2, "R4E_REVIEW_PHASE_DECISION", "R4E_REVIEW_PHASE_DECISION"),
-
-	/**
-	 * The '<em><b>R4E REVIEW PHASE REWORK</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_REWORK_VALUE
+	DECISION(2, "Decision", "DECISION"), /**
+	 * The '<em><b>Rework</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #REWORK_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_PHASE_REWORK(3, "R4E_REVIEW_PHASE_REWORK", "R4E_REVIEW_PHASE_REWORK"),
-
-	/**
-	 * The '<em><b>R4E REVIEW PHASE COMPLETED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_COMPLETED_VALUE
+	REWORK(3, "Rework", "REWORK"), /**
+	 * The '<em><b>Completed</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #COMPLETED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_PHASE_COMPLETED(4, "R4E_REVIEW_PHASE_COMPLETED", "R4E_REVIEW_PHASE_COMPLETED");
+	COMPLETED(4, "Completed", "COMPLETED");
 
 	/**
-	 * The '<em><b>R4E REVIEW PHASE STARTED</b></em>' literal value.
+	 * The '<em><b>Started</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW PHASE STARTED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Started</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_STARTED
-	 * @model
+	 * @see #STARTED
+	 * @model name="Started" literal="STARTED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_PHASE_STARTED_VALUE = 0;
+	public static final int STARTED_VALUE = 0;
 
 	/**
-	 * The '<em><b>R4E REVIEW PHASE PREPARATION</b></em>' literal value.
+	 * The '<em><b>Preparation</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW PHASE PREPARATION</b></em>' literal object isn't clear, there really should
-	 * be more of a description here...
+	 * If the meaning of '<em><b>Preparation</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_PREPARATION
-	 * @model
+	 * @see #PREPARATION
+	 * @model name="Preparation" literal="PREPARATION"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_PHASE_PREPARATION_VALUE = 1;
+	public static final int PREPARATION_VALUE = 1;
 
 	/**
-	 * The '<em><b>R4E REVIEW PHASE DECISION</b></em>' literal value.
+	 * The '<em><b>Decision</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW PHASE DECISION</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Decision</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_DECISION
-	 * @model
+	 * @see #DECISION
+	 * @model name="Decision" literal="DECISION"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_PHASE_DECISION_VALUE = 2;
+	public static final int DECISION_VALUE = 2;
 
 	/**
-	 * The '<em><b>R4E REVIEW PHASE REWORK</b></em>' literal value.
+	 * The '<em><b>Rework</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW PHASE REWORK</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Rework</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_REWORK
-	 * @model
+	 * @see #REWORK
+	 * @model name="Rework" literal="REWORK"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_PHASE_REWORK_VALUE = 3;
+	public static final int REWORK_VALUE = 3;
 
 	/**
-	 * The '<em><b>R4E REVIEW PHASE COMPLETED</b></em>' literal value.
+	 * The '<em><b>Completed</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW PHASE COMPLETED</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Completed</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_PHASE_COMPLETED
-	 * @model
+	 * @see #COMPLETED
+	 * @model name="Completed" literal="COMPLETED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_PHASE_COMPLETED_VALUE = 4;
+	public static final int COMPLETED_VALUE = 4;
 
 	/**
 	 * An array of all the '<em><b>R4E Review Phase</b></em>' enumerators.
@@ -154,11 +151,11 @@ public enum R4EReviewPhase implements Enumerator {
 	 * @generated
 	 */
 	private static final R4EReviewPhase[] VALUES_ARRAY = new R4EReviewPhase[] {
-			R4E_REVIEW_PHASE_STARTED,
-			R4E_REVIEW_PHASE_PREPARATION,
-			R4E_REVIEW_PHASE_DECISION,
-			R4E_REVIEW_PHASE_REWORK,
-			R4E_REVIEW_PHASE_COMPLETED,
+			STARTED,
+			PREPARATION,
+			DECISION,
+			REWORK,
+			COMPLETED,
 		};
 
 	/**
@@ -209,11 +206,11 @@ public enum R4EReviewPhase implements Enumerator {
 	 */
 	public static R4EReviewPhase get(int value) {
 		switch (value) {
-			case R4E_REVIEW_PHASE_STARTED_VALUE: return R4E_REVIEW_PHASE_STARTED;
-			case R4E_REVIEW_PHASE_PREPARATION_VALUE: return R4E_REVIEW_PHASE_PREPARATION;
-			case R4E_REVIEW_PHASE_DECISION_VALUE: return R4E_REVIEW_PHASE_DECISION;
-			case R4E_REVIEW_PHASE_REWORK_VALUE: return R4E_REVIEW_PHASE_REWORK;
-			case R4E_REVIEW_PHASE_COMPLETED_VALUE: return R4E_REVIEW_PHASE_COMPLETED;
+			case STARTED_VALUE: return STARTED;
+			case PREPARATION_VALUE: return PREPARATION;
+			case DECISION_VALUE: return DECISION;
+			case REWORK_VALUE: return REWORK;
+			case COMPLETED_VALUE: return COMPLETED;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewPhaseInfo.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewPhaseInfo.java
index ef713467..28668010 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewPhaseInfo.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewPhaseInfo.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewState.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewState.java
index 083c0dcb..a00c09c7 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewState.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewState.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,7 +14,7 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
+import org.eclipse.mylyn.reviews.core.model.IReviewState;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Review State</b></em>'. <!-- end-user-doc
@@ -30,8 +30,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
  * @model
  * @generated
  */
-public interface R4EReviewState extends ReviewState {
-
+public interface R4EReviewState extends IReviewState {
 	/**
 	 * Returns the value of the '<em><b>State</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase}.
@@ -59,4 +58,5 @@ public interface R4EReviewState extends ReviewState {
 	 * @generated
 	 */
 	void setState(R4EReviewPhase value);
+
 } // R4EReviewState
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewType.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewType.java
index 7940206a..ada09a10 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewType.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EReviewType.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -29,72 +29,75 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum R4EReviewType implements Enumerator {
 	/**
-	 * The '<em><b>R4E REVIEW TYPE BASIC</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_TYPE_BASIC_VALUE
+	 * The '<em><b>Basic</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #BASIC_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_TYPE_BASIC(0, "R4E_REVIEW_TYPE_BASIC", "R4E_REVIEW_TYPE_BASIC"), /**
-	 * The '<em><b>R4E REVIEW TYPE INFORMAL</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_TYPE_INFORMAL_VALUE
+	BASIC(0, "Basic", "BASIC"), /**
+	 * The '<em><b>Informal</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #INFORMAL_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_TYPE_INFORMAL(1, "R4E_REVIEW_TYPE_INFORMAL", "R4E_REVIEW_TYPE_INFORMAL"), /**
-	 * The '<em><b>R4E REVIEW TYPE FORMAL</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_TYPE_FORMAL_VALUE
+	INFORMAL(1, "Informal", "INFORMAL"), /**
+	 * The '<em><b>Formal</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #FORMAL_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_REVIEW_TYPE_FORMAL(2, "R4E_REVIEW_TYPE_FORMAL", "R4E_REVIEW_TYPE_FORMAL");
+	FORMAL(2, "Formal", "FORMAL");
 
 	/**
-	 * The '<em><b>R4E REVIEW TYPE BASIC</b></em>' literal value.
+	 * The '<em><b>Basic</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW TYPE BASIC</b></em>' literal object isn't clear, there really should be more
-	 * of a description here...
+	 * If the meaning of '<em><b>Basic</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_TYPE_BASIC
-	 * @model
+	 * @see #BASIC
+	 * @model name="Basic" literal="BASIC"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_TYPE_BASIC_VALUE = 0;
+	public static final int BASIC_VALUE = 0;
 
 	/**
-	 * The '<em><b>R4E REVIEW TYPE INFORMAL</b></em>' literal value.
+	 * The '<em><b>Informal</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E REVIEW TYPE INFORMAL</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Informal</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_TYPE_INFORMAL
-	 * @model
+	 * @see #INFORMAL
+	 * @model name="Informal" literal="INFORMAL"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_TYPE_INFORMAL_VALUE = 1;
+	public static final int INFORMAL_VALUE = 1;
 
 	/**
-	 * The '<em><b>R4E REVIEW TYPE FORMAL</b></em>' literal value.
+	 * The '<em><b>Formal</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E Review Type Formal</b></em>' literal object isn't clear, there really should be
-	 * more of a description here...
+	 * If the meaning of '<em><b>Formal</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_REVIEW_TYPE_FORMAL
-	 * @model
+	 * @see #FORMAL
+	 * @model name="Formal" literal="FORMAL"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_REVIEW_TYPE_FORMAL_VALUE = 2;
+	public static final int FORMAL_VALUE = 2;
 
 	/**
 	 * An array of all the '<em><b>R4E Review Type</b></em>' enumerators.
@@ -102,9 +105,9 @@ public enum R4EReviewType implements Enumerator {
 	 * @generated
 	 */
 	private static final R4EReviewType[] VALUES_ARRAY = new R4EReviewType[] {
-			R4E_REVIEW_TYPE_BASIC,
-			R4E_REVIEW_TYPE_INFORMAL,
-			R4E_REVIEW_TYPE_FORMAL,
+			BASIC,
+			INFORMAL,
+			FORMAL,
 		};
 
 	/**
@@ -155,9 +158,9 @@ public enum R4EReviewType implements Enumerator {
 	 */
 	public static R4EReviewType get(int value) {
 		switch (value) {
-			case R4E_REVIEW_TYPE_BASIC_VALUE: return R4E_REVIEW_TYPE_BASIC;
-			case R4E_REVIEW_TYPE_INFORMAL_VALUE: return R4E_REVIEW_TYPE_INFORMAL;
-			case R4E_REVIEW_TYPE_FORMAL_VALUE: return R4E_REVIEW_TYPE_FORMAL;
+			case BASIC_VALUE: return BASIC;
+			case INFORMAL_VALUE: return INFORMAL;
+			case FORMAL_VALUE: return FORMAL;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETaskReference.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETaskReference.java
index 59caf36e..4bca9e72 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETaskReference.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETaskReference.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,7 +14,7 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
+import org.eclipse.mylyn.reviews.core.model.ITaskReference;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Task Reference</b></em>'. <!-- end-user-doc
@@ -24,6 +24,5 @@ import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
  * @model
  * @generated
  */
-public interface R4ETaskReference extends TaskReference, R4EReviewComponent {
-
+public interface R4ETaskReference extends ITaskReference, R4EReviewComponent {
 } // R4ETaskReference
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETextContent.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETextContent.java
index a649a064..e039214a 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETextContent.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETextContent.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETextPosition.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETextPosition.java
index 5f13b197..a860f2ca 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETextPosition.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4ETextPosition.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUser.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUser.java
index 45c53aeb..d527beff 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUser.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUser.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,8 +14,9 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
+import java.util.List;
+
+import org.eclipse.mylyn.reviews.core.model.IUser;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E User</b></em>'. <!-- end-user-doc -->
@@ -38,7 +39,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.User;
  * @model
  * @generated
  */
-public interface R4EUser extends User, R4EReviewComponent {
+public interface R4EUser extends IUser, R4EReviewComponent {
 	/**
 	 * Returns the value of the '<em><b>Group Paths</b></em>' attribute list.
 	 * The list contents are of type {@link java.lang.String}.
@@ -53,7 +54,7 @@ public interface R4EUser extends User, R4EReviewComponent {
 	 * @model transient="true" derived="true"
 	 * @generated
 	 */
-	EList<String> getGroupPaths();
+	List<String> getGroupPaths();
 
 	/**
 	 * Returns the value of the '<em><b>Sequence ID Counter</b></em>' attribute.
@@ -76,6 +77,7 @@ public interface R4EUser extends User, R4EReviewComponent {
 	 * 
 	 * @return <br>
 	 *         MANUAL: Manual entry
+	 * @generated NOT
 	 */
 	int getSequenceIDCounterNext();
 
@@ -102,7 +104,7 @@ public interface R4EUser extends User, R4EReviewComponent {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EComment> getAddedComments();
+	List<R4EComment> getAddedComments();
 
 	/**
 	 * Returns the value of the '<em><b>Added Items</b></em>' containment reference list.
@@ -118,7 +120,7 @@ public interface R4EUser extends User, R4EReviewComponent {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EItem> getAddedItems();
+	List<R4EItem> getAddedItems();
 
 	/**
 	 * Returns the value of the '<em><b>Review Created By Me</b></em>' attribute.
@@ -149,8 +151,8 @@ public interface R4EUser extends User, R4EReviewComponent {
 	 * Returns the value of the '<em><b>Review Instance</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Review Instance</em>' containment reference isn't clear, there really should be more
-	 * of a description here...
+	 * If the meaning of the '<em>Review Instance</em>' reference isn't clear, there really should be more of a
+	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Review Instance</em>' reference.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUserReviews.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUserReviews.java
index 5f15b560..293ff295 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUserReviews.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUserReviews.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,8 +14,8 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -76,7 +76,7 @@ public interface R4EUserReviews extends EObject {
 	 * @model mapType="org.eclipse.mylyn.reviews.r4e.core.model.MapNameToReview<org.eclipse.emf.ecore.EString, org.eclipse.mylyn.reviews.r4e.core.model.R4EReview>"
 	 * @generated
 	 */
-	EMap<String, R4EReview> getInvitedToMap();
+	Map<String, R4EReview> getInvitedToMap();
 
 	/**
 	 * Returns the value of the '<em><b>Group</b></em>' reference.
@@ -117,6 +117,6 @@ public interface R4EUserReviews extends EObject {
 	 * @model
 	 * @generated
 	 */
-	EList<String> getCreatedReviews();
+	List<String> getCreatedReviews();
 
 } // R4EUserReviews
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUserRole.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUserRole.java
index 5b2d875a..3da7c359 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUserRole.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/R4EUserRole.java
@@ -1,7 +1,6 @@
 /**
-/**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -30,95 +29,98 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum R4EUserRole implements Enumerator {
 	/**
-	 * The '<em><b>R4E ROLE REVIEWER</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ROLE_REVIEWER_VALUE
+	 * The '<em><b>Reviewer</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #REVIEWER_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ROLE_REVIEWER(0, "R4E_ROLE_REVIEWER", "R4E_ROLE_REVIEWER"), /**
-	 * The '<em><b>R4E ROLE LEAD</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ROLE_LEAD_VALUE
+	REVIEWER(0, "Reviewer", "REVIEWER"), /**
+	 * The '<em><b>Lead</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #LEAD_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ROLE_LEAD(1, "R4E_ROLE_LEAD", "R4E_ROLE_LEAD"), /**
-	 * The '<em><b>R4E ROLE AUTHOR</b></em>' literal object. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #R4E_ROLE_AUTHOR_VALUE
+	LEAD(1, "Lead", "LEAD"), /**
+	 * The '<em><b>Author</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #AUTHOR_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ROLE_AUTHOR(2, "R4E_ROLE_AUTHOR", "R4E_ROLE_AUTHOR"), /**
-	 * The '<em><b>R4E ROLE ORGANIZER</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_ROLE_ORGANIZER_VALUE
+	AUTHOR(2, "Author", "AUTHOR"), /**
+	 * The '<em><b>Organizer</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ORGANIZER_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_ROLE_ORGANIZER(3, "R4E_ROLE_ORGANIZER", "R4E_ROLE_ORGANIZER");
+	ORGANIZER(3, "Organizer", "ORGANIZER");
 
 	/**
-	 * The '<em><b>R4E ROLE REVIEWER</b></em>' literal value.
+	 * The '<em><b>Reviewer</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ROLE REVIEWER</b></em>' literal object isn't clear, there really should be more of
-	 * a description here...
+	 * If the meaning of '<em><b>Reviewer</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ROLE_REVIEWER
-	 * @model
+	 * @see #REVIEWER
+	 * @model name="Reviewer" literal="REVIEWER"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ROLE_REVIEWER_VALUE = 0;
+	public static final int REVIEWER_VALUE = 0;
 
 	/**
-	 * The '<em><b>R4E ROLE LEAD</b></em>' literal value.
+	 * The '<em><b>Lead</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ROLE LEAD</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Lead</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ROLE_LEAD
-	 * @model
+	 * @see #LEAD
+	 * @model name="Lead" literal="LEAD"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ROLE_LEAD_VALUE = 1;
+	public static final int LEAD_VALUE = 1;
 
 	/**
-	 * The '<em><b>R4E ROLE AUTHOR</b></em>' literal value.
+	 * The '<em><b>Author</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ROLE AUTHOR</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Author</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ROLE_AUTHOR
-	 * @model
+	 * @see #AUTHOR
+	 * @model name="Author" literal="AUTHOR"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ROLE_AUTHOR_VALUE = 2;
+	public static final int AUTHOR_VALUE = 2;
 
 	/**
-	 * The '<em><b>R4E ROLE ORGANIZER</b></em>' literal value.
+	 * The '<em><b>Organizer</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E ROLE ORGANIZER</b></em>' literal object isn't clear, there really should be more of
-	 * a description here...
+	 * If the meaning of '<em><b>Organizer</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_ROLE_ORGANIZER
-	 * @model
+	 * @see #ORGANIZER
+	 * @model name="Organizer" literal="ORGANIZER"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_ROLE_ORGANIZER_VALUE = 3;
+	public static final int ORGANIZER_VALUE = 3;
 
 	/**
 	 * An array of all the '<em><b>R4E User Role</b></em>' enumerators.
@@ -126,10 +128,10 @@ public enum R4EUserRole implements Enumerator {
 	 * @generated
 	 */
 	private static final R4EUserRole[] VALUES_ARRAY = new R4EUserRole[] {
-			R4E_ROLE_REVIEWER,
-			R4E_ROLE_LEAD,
-			R4E_ROLE_AUTHOR,
-			R4E_ROLE_ORGANIZER,
+			REVIEWER,
+			LEAD,
+			AUTHOR,
+			ORGANIZER,
 		};
 
 	/**
@@ -180,10 +182,10 @@ public enum R4EUserRole implements Enumerator {
 	 */
 	public static R4EUserRole get(int value) {
 		switch (value) {
-			case R4E_ROLE_REVIEWER_VALUE: return R4E_ROLE_REVIEWER;
-			case R4E_ROLE_LEAD_VALUE: return R4E_ROLE_LEAD;
-			case R4E_ROLE_AUTHOR_VALUE: return R4E_ROLE_AUTHOR;
-			case R4E_ROLE_ORGANIZER_VALUE: return R4E_ROLE_ORGANIZER;
+			case REVIEWER_VALUE: return REVIEWER;
+			case LEAD_VALUE: return LEAD;
+			case AUTHOR_VALUE: return AUTHOR;
+			case ORGANIZER_VALUE: return ORGANIZER;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/RModelPackage.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/RModelPackage.java
index 2fdf45c0..4fbb449d 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/RModelPackage.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/RModelPackage.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 
 /**
  * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
@@ -79,33 +79,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__ENABLED = ModelPackage.REVIEW_GROUP__ENABLED;
-
-	/**
-	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int R4E_REVIEW_GROUP__FRAGMENT_VERSION = ModelPackage.REVIEW_GROUP__FRAGMENT_VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int R4E_REVIEW_GROUP__COMPATIBILITY = ModelPackage.REVIEW_GROUP__COMPATIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Application Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int R4E_REVIEW_GROUP__APPLICATION_VERSION = ModelPackage.REVIEW_GROUP__APPLICATION_VERSION;
+	int R4E_REVIEW_GROUP__ENABLED = ReviewsPackage.REVIEW_GROUP__ENABLED;
 
 	/**
 	 * The feature id for the '<em><b>Reviews</b></em>' containment reference list.
@@ -114,7 +88,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__REVIEWS = ModelPackage.REVIEW_GROUP__REVIEWS;
+	int R4E_REVIEW_GROUP__REVIEWS = ReviewsPackage.REVIEW_GROUP__REVIEWS;
 
 	/**
 	 * The feature id for the '<em><b>Review Group Task</b></em>' containment reference.
@@ -123,7 +97,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__REVIEW_GROUP_TASK = ModelPackage.REVIEW_GROUP__REVIEW_GROUP_TASK;
+	int R4E_REVIEW_GROUP__REVIEW_GROUP_TASK = ReviewsPackage.REVIEW_GROUP__REVIEW_GROUP_TASK;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -131,7 +105,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__DESCRIPTION = ModelPackage.REVIEW_GROUP__DESCRIPTION;
+	int R4E_REVIEW_GROUP__DESCRIPTION = ReviewsPackage.REVIEW_GROUP__DESCRIPTION;
 
 	/**
 	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -140,7 +114,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__ASSIGNED_TO = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 0;
+	int R4E_REVIEW_GROUP__ASSIGNED_TO = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_REVIEW_GROUP__FRAGMENT_VERSION = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -148,7 +131,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__NAME = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 1;
+	int R4E_REVIEW_GROUP__NAME = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Folder</b></em>' attribute.
@@ -156,7 +139,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__FOLDER = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 2;
+	int R4E_REVIEW_GROUP__FOLDER = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Default Entry Criteria</b></em>' attribute.
@@ -165,7 +148,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__DEFAULT_ENTRY_CRITERIA = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 3;
+	int R4E_REVIEW_GROUP__DEFAULT_ENTRY_CRITERIA = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Available Projects</b></em>' attribute list.
@@ -174,7 +157,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__AVAILABLE_PROJECTS = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 4;
+	int R4E_REVIEW_GROUP__AVAILABLE_PROJECTS = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Available Components</b></em>' attribute list.
@@ -183,7 +166,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__AVAILABLE_COMPONENTS = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 5;
+	int R4E_REVIEW_GROUP__AVAILABLE_COMPONENTS = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Design Rule Locations</b></em>' attribute list.
@@ -192,7 +175,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__DESIGN_RULE_LOCATIONS = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 6;
+	int R4E_REVIEW_GROUP__DESIGN_RULE_LOCATIONS = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Available Anomaly Types</b></em>' containment reference list.
@@ -201,7 +184,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__AVAILABLE_ANOMALY_TYPES = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 7;
+	int R4E_REVIEW_GROUP__AVAILABLE_ANOMALY_TYPES = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Anomaly Type Key To Reference</b></em>' map.
@@ -210,7 +193,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__ANOMALY_TYPE_KEY_TO_REFERENCE = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 8;
+	int R4E_REVIEW_GROUP__ANOMALY_TYPE_KEY_TO_REFERENCE = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Reviews Map</b></em>' map.
@@ -218,7 +201,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__REVIEWS_MAP = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 9;
+	int R4E_REVIEW_GROUP__REVIEWS_MAP = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>User Reviews</b></em>' map.
@@ -226,7 +209,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP__USER_REVIEWS = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 10;
+	int R4E_REVIEW_GROUP__USER_REVIEWS = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 11;
 
 	/**
 	 * The number of structural features of the '<em>R4E Review Group</em>' class.
@@ -235,7 +218,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_GROUP_FEATURE_COUNT = ModelPackage.REVIEW_GROUP_FEATURE_COUNT + 11;
+	int R4E_REVIEW_GROUP_FEATURE_COUNT = ReviewsPackage.REVIEW_GROUP_FEATURE_COUNT + 12;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl <em>R4E Review</em>}' class.
@@ -252,77 +235,67 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__ENABLED = ModelPackage.REVIEW__ENABLED;
+	int R4E_REVIEW__ENABLED = ReviewsPackage.REVIEW__ENABLED;
 
 	/**
-	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int R4E_REVIEW__FRAGMENT_VERSION = ModelPackage.REVIEW__FRAGMENT_VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute.
+	 * The feature id for the '<em><b>Topics</b></em>' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__COMPATIBILITY = ModelPackage.REVIEW__COMPATIBILITY;
+	int R4E_REVIEW__TOPICS = ReviewsPackage.REVIEW__TOPICS;
 
 	/**
-	 * The feature id for the '<em><b>Application Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
+	 * The feature id for the '<em><b>Items</b></em>' reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__APPLICATION_VERSION = ModelPackage.REVIEW__APPLICATION_VERSION;
+	int R4E_REVIEW__ITEMS = ReviewsPackage.REVIEW__ITEMS;
 
 	/**
-	 * The feature id for the '<em><b>Topics</b></em>' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Review Task</b></em>' containment reference.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__TOPICS = ModelPackage.REVIEW__TOPICS;
+	int R4E_REVIEW__REVIEW_TASK = ReviewsPackage.REVIEW__REVIEW_TASK;
 
 	/**
-	 * The feature id for the '<em><b>Review Items</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * The feature id for the '<em><b>State</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__REVIEW_ITEMS = ModelPackage.REVIEW__REVIEW_ITEMS;
+	int R4E_REVIEW__STATE = ReviewsPackage.REVIEW__STATE;
 
 	/**
-	 * The feature id for the '<em><b>Review Task</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__REVIEW_TASK = ModelPackage.REVIEW__REVIEW_TASK;
+	int R4E_REVIEW__ID = ReviewsPackage.REVIEW__ID;
 
 	/**
-	 * The feature id for the '<em><b>State</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__STATE = ModelPackage.REVIEW__STATE;
+	int R4E_REVIEW__ASSIGNED_TO = ReviewsPackage.REVIEW_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__ASSIGNED_TO = ModelPackage.REVIEW_FEATURE_COUNT + 0;
+	int R4E_REVIEW__FRAGMENT_VERSION = ReviewsPackage.REVIEW_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -330,7 +303,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__NAME = ModelPackage.REVIEW_FEATURE_COUNT + 1;
+	int R4E_REVIEW__NAME = ReviewsPackage.REVIEW_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Project</b></em>' attribute.
@@ -338,7 +311,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__PROJECT = ModelPackage.REVIEW_FEATURE_COUNT + 2;
+	int R4E_REVIEW__PROJECT = ReviewsPackage.REVIEW_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Components</b></em>' attribute list.
@@ -346,7 +319,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__COMPONENTS = ModelPackage.REVIEW_FEATURE_COUNT + 3;
+	int R4E_REVIEW__COMPONENTS = ReviewsPackage.REVIEW_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Entry Criteria</b></em>' attribute.
@@ -354,7 +327,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__ENTRY_CRITERIA = ModelPackage.REVIEW_FEATURE_COUNT + 4;
+	int R4E_REVIEW__ENTRY_CRITERIA = ReviewsPackage.REVIEW_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Extra Notes</b></em>' attribute.
@@ -362,7 +335,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__EXTRA_NOTES = ModelPackage.REVIEW_FEATURE_COUNT + 5;
+	int R4E_REVIEW__EXTRA_NOTES = ReviewsPackage.REVIEW_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Objectives</b></em>' attribute.
@@ -370,7 +343,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__OBJECTIVES = ModelPackage.REVIEW_FEATURE_COUNT + 6;
+	int R4E_REVIEW__OBJECTIVES = ReviewsPackage.REVIEW_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Reference Material</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -379,7 +352,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__REFERENCE_MATERIAL = ModelPackage.REVIEW_FEATURE_COUNT + 7;
+	int R4E_REVIEW__REFERENCE_MATERIAL = ReviewsPackage.REVIEW_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Decision</b></em>' containment reference.
@@ -388,7 +361,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__DECISION = ModelPackage.REVIEW_FEATURE_COUNT + 8;
+	int R4E_REVIEW__DECISION = ReviewsPackage.REVIEW_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Start Date</b></em>' attribute.
@@ -396,7 +369,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__START_DATE = ModelPackage.REVIEW_FEATURE_COUNT + 9;
+	int R4E_REVIEW__START_DATE = ReviewsPackage.REVIEW_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>End Date</b></em>' attribute.
@@ -404,7 +377,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__END_DATE = ModelPackage.REVIEW_FEATURE_COUNT + 10;
+	int R4E_REVIEW__END_DATE = ReviewsPackage.REVIEW_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Due Date</b></em>' attribute.
@@ -412,7 +385,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__DUE_DATE = ModelPackage.REVIEW_FEATURE_COUNT + 11;
+	int R4E_REVIEW__DUE_DATE = ReviewsPackage.REVIEW_FEATURE_COUNT + 12;
+
+	/**
+	 * The feature id for the '<em><b>Modified Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_REVIEW__MODIFIED_DATE = ReviewsPackage.REVIEW_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Anomaly Template</b></em>' containment reference.
@@ -421,7 +403,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__ANOMALY_TEMPLATE = ModelPackage.REVIEW_FEATURE_COUNT + 12;
+	int R4E_REVIEW__ANOMALY_TEMPLATE = ReviewsPackage.REVIEW_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Type</b></em>' attribute.
@@ -429,7 +411,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__TYPE = ModelPackage.REVIEW_FEATURE_COUNT + 13;
+	int R4E_REVIEW__TYPE = ReviewsPackage.REVIEW_FEATURE_COUNT + 15;
 
 	/**
 	 * The feature id for the '<em><b>Users Map</b></em>' map.
@@ -437,7 +419,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__USERS_MAP = ModelPackage.REVIEW_FEATURE_COUNT + 14;
+	int R4E_REVIEW__USERS_MAP = ReviewsPackage.REVIEW_FEATURE_COUNT + 16;
 
 	/**
 	 * The feature id for the '<em><b>Created By</b></em>' reference.
@@ -445,7 +427,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__CREATED_BY = ModelPackage.REVIEW_FEATURE_COUNT + 15;
+	int R4E_REVIEW__CREATED_BY = ReviewsPackage.REVIEW_FEATURE_COUNT + 17;
 
 	/**
 	 * The feature id for the '<em><b>Ids Map</b></em>' map.
@@ -453,7 +435,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__IDS_MAP = ModelPackage.REVIEW_FEATURE_COUNT + 16;
+	int R4E_REVIEW__IDS_MAP = ReviewsPackage.REVIEW_FEATURE_COUNT + 18;
 
 	/**
 	 * The feature id for the '<em><b>Active Meeting</b></em>' containment reference.
@@ -462,7 +444,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW__ACTIVE_MEETING = ModelPackage.REVIEW_FEATURE_COUNT + 17;
+	int R4E_REVIEW__ACTIVE_MEETING = ReviewsPackage.REVIEW_FEATURE_COUNT + 19;
 
 	/**
 	 * The number of structural features of the '<em>R4E Review</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -471,7 +453,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_FEATURE_COUNT = ModelPackage.REVIEW_FEATURE_COUNT + 18;
+	int R4E_REVIEW_FEATURE_COUNT = ReviewsPackage.REVIEW_FEATURE_COUNT + 20;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl <em>R4E Anomaly</em>}' class.
@@ -488,15 +470,15 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__ENABLED = ModelPackage.TOPIC__ENABLED;
+	int R4E_ANOMALY__ENABLED = ReviewsPackage.TOPIC__ENABLED;
 
 	/**
-	 * The feature id for the '<em><b>User</b></em>' reference.
+	 * The feature id for the '<em><b>Author</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__USER = ModelPackage.TOPIC__USER;
+	int R4E_ANOMALY__AUTHOR = ReviewsPackage.TOPIC__AUTHOR;
 
 	/**
 	 * The feature id for the '<em><b>Type</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
@@ -505,7 +487,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__TYPE = ModelPackage.TOPIC__TYPE;
+	int R4E_ANOMALY__TYPE = ReviewsPackage.TOPIC__TYPE;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -513,7 +495,40 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__DESCRIPTION = ModelPackage.TOPIC__DESCRIPTION;
+	int R4E_ANOMALY__DESCRIPTION = ReviewsPackage.TOPIC__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Creation Date</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_ANOMALY__CREATION_DATE = ReviewsPackage.TOPIC__CREATION_DATE;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_ANOMALY__ID = ReviewsPackage.TOPIC__ID;
+
+	/**
+	 * The feature id for the '<em><b>Replies</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_ANOMALY__REPLIES = ReviewsPackage.TOPIC__REPLIES;
+
+	/**
+	 * The feature id for the '<em><b>Draft</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_ANOMALY__DRAFT = ReviewsPackage.TOPIC__DRAFT;
 
 	/**
 	 * The feature id for the '<em><b>Task</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
@@ -522,16 +537,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__TASK = ModelPackage.TOPIC__TASK;
+	int R4E_ANOMALY__TASK = ReviewsPackage.TOPIC__TASK;
 
 	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Locations</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__LOCATION = ModelPackage.TOPIC__LOCATION;
+	int R4E_ANOMALY__LOCATIONS = ReviewsPackage.TOPIC__LOCATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Comments</b></em>' reference list.
@@ -539,7 +554,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__COMMENTS = ModelPackage.TOPIC__COMMENTS;
+	int R4E_ANOMALY__COMMENTS = ReviewsPackage.TOPIC__COMMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Review</b></em>' reference.
@@ -547,7 +562,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__REVIEW = ModelPackage.TOPIC__REVIEW;
+	int R4E_ANOMALY__REVIEW = ReviewsPackage.TOPIC__REVIEW;
 
 	/**
 	 * The feature id for the '<em><b>Title</b></em>' attribute.
@@ -555,7 +570,15 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__TITLE = ModelPackage.TOPIC__TITLE;
+	int R4E_ANOMALY__TITLE = ReviewsPackage.TOPIC__TITLE;
+
+	/**
+	 * The feature id for the '<em><b>Item</b></em>' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_ANOMALY__ITEM = ReviewsPackage.TOPIC__ITEM;
 
 	/**
 	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -564,15 +587,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__ASSIGNED_TO = ModelPackage.TOPIC_FEATURE_COUNT + 0;
+	int R4E_ANOMALY__ASSIGNED_TO = ReviewsPackage.TOPIC_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>R4e Id</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__ID = ModelPackage.TOPIC_FEATURE_COUNT + 1;
+	int R4E_ANOMALY__R4E_ID = ReviewsPackage.TOPIC_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Created On</b></em>' attribute.
@@ -580,7 +604,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__CREATED_ON = ModelPackage.TOPIC_FEATURE_COUNT + 2;
+	int R4E_ANOMALY__CREATED_ON = ReviewsPackage.TOPIC_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Anomaly</b></em>' reference.
@@ -588,7 +612,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__ANOMALY = ModelPackage.TOPIC_FEATURE_COUNT + 3;
+	int R4E_ANOMALY__ANOMALY = ReviewsPackage.TOPIC_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Info Att</b></em>' map.
@@ -596,7 +620,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__INFO_ATT = ModelPackage.TOPIC_FEATURE_COUNT + 4;
+	int R4E_ANOMALY__INFO_ATT = ReviewsPackage.TOPIC_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>State</b></em>' attribute.
@@ -604,7 +628,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__STATE = ModelPackage.TOPIC_FEATURE_COUNT + 5;
+	int R4E_ANOMALY__STATE = ReviewsPackage.TOPIC_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Due Date</b></em>' attribute.
@@ -612,7 +636,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__DUE_DATE = ModelPackage.TOPIC_FEATURE_COUNT + 6;
+	int R4E_ANOMALY__DUE_DATE = ReviewsPackage.TOPIC_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Rank</b></em>' attribute.
@@ -620,7 +644,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__RANK = ModelPackage.TOPIC_FEATURE_COUNT + 7;
+	int R4E_ANOMALY__RANK = ReviewsPackage.TOPIC_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Rule</b></em>' reference.
@@ -628,7 +652,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__RULE = ModelPackage.TOPIC_FEATURE_COUNT + 8;
+	int R4E_ANOMALY__RULE = ReviewsPackage.TOPIC_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Not Accepted Reason</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -637,7 +661,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__NOT_ACCEPTED_REASON = ModelPackage.TOPIC_FEATURE_COUNT + 9;
+	int R4E_ANOMALY__NOT_ACCEPTED_REASON = ReviewsPackage.TOPIC_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Is Imported</b></em>' attribute.
@@ -645,7 +669,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__IS_IMPORTED = ModelPackage.TOPIC_FEATURE_COUNT + 10;
+	int R4E_ANOMALY__IS_IMPORTED = ReviewsPackage.TOPIC_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Fixed In Version</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
@@ -654,7 +678,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__FIXED_IN_VERSION = ModelPackage.TOPIC_FEATURE_COUNT + 11;
+	int R4E_ANOMALY__FIXED_IN_VERSION = ReviewsPackage.TOPIC_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Rule ID</b></em>' attribute.
@@ -662,7 +686,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__RULE_ID = ModelPackage.TOPIC_FEATURE_COUNT + 12;
+	int R4E_ANOMALY__RULE_ID = ReviewsPackage.TOPIC_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Decided By ID</b></em>' attribute.
@@ -670,7 +694,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__DECIDED_BY_ID = ModelPackage.TOPIC_FEATURE_COUNT + 13;
+	int R4E_ANOMALY__DECIDED_BY_ID = ReviewsPackage.TOPIC_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Fixed By ID</b></em>' attribute.
@@ -678,7 +702,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__FIXED_BY_ID = ModelPackage.TOPIC_FEATURE_COUNT + 14;
+	int R4E_ANOMALY__FIXED_BY_ID = ReviewsPackage.TOPIC_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Follow Up By ID</b></em>' attribute.
@@ -686,7 +710,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY__FOLLOW_UP_BY_ID = ModelPackage.TOPIC_FEATURE_COUNT + 15;
+	int R4E_ANOMALY__FOLLOW_UP_BY_ID = ReviewsPackage.TOPIC_FEATURE_COUNT + 15;
 
 	/**
 	 * The number of structural features of the '<em>R4E Anomaly</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -695,7 +719,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY_FEATURE_COUNT = ModelPackage.TOPIC_FEATURE_COUNT + 16;
+	int R4E_ANOMALY_FEATURE_COUNT = ReviewsPackage.TOPIC_FEATURE_COUNT + 16;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EFormalReviewImpl <em>R4E Formal Review</em>}' class.
@@ -715,74 +739,64 @@ public interface RModelPackage extends EPackage {
 	int R4E_FORMAL_REVIEW__ENABLED = R4E_REVIEW__ENABLED;
 
 	/**
-	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int R4E_FORMAL_REVIEW__FRAGMENT_VERSION = R4E_REVIEW__FRAGMENT_VERSION;
-
-	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute.
+	 * The feature id for the '<em><b>Topics</b></em>' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_FORMAL_REVIEW__COMPATIBILITY = R4E_REVIEW__COMPATIBILITY;
+	int R4E_FORMAL_REVIEW__TOPICS = R4E_REVIEW__TOPICS;
 
 	/**
-	 * The feature id for the '<em><b>Application Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
+	 * The feature id for the '<em><b>Items</b></em>' reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_FORMAL_REVIEW__APPLICATION_VERSION = R4E_REVIEW__APPLICATION_VERSION;
+	int R4E_FORMAL_REVIEW__ITEMS = R4E_REVIEW__ITEMS;
 
 	/**
-	 * The feature id for the '<em><b>Topics</b></em>' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>Review Task</b></em>' containment reference.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_FORMAL_REVIEW__TOPICS = R4E_REVIEW__TOPICS;
+	int R4E_FORMAL_REVIEW__REVIEW_TASK = R4E_REVIEW__REVIEW_TASK;
 
 	/**
-	 * The feature id for the '<em><b>Review Items</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * The feature id for the '<em><b>State</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_FORMAL_REVIEW__REVIEW_ITEMS = R4E_REVIEW__REVIEW_ITEMS;
+	int R4E_FORMAL_REVIEW__STATE = R4E_REVIEW__STATE;
 
 	/**
-	 * The feature id for the '<em><b>Review Task</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_FORMAL_REVIEW__REVIEW_TASK = R4E_REVIEW__REVIEW_TASK;
+	int R4E_FORMAL_REVIEW__ID = R4E_REVIEW__ID;
 
 	/**
-	 * The feature id for the '<em><b>State</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_FORMAL_REVIEW__STATE = R4E_REVIEW__STATE;
+	int R4E_FORMAL_REVIEW__ASSIGNED_TO = R4E_REVIEW__ASSIGNED_TO;
 
 	/**
-	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
+	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_FORMAL_REVIEW__ASSIGNED_TO = R4E_REVIEW__ASSIGNED_TO;
+	int R4E_FORMAL_REVIEW__FRAGMENT_VERSION = R4E_REVIEW__FRAGMENT_VERSION;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -875,6 +889,15 @@ public interface RModelPackage extends EPackage {
 	int R4E_FORMAL_REVIEW__DUE_DATE = R4E_REVIEW__DUE_DATE;
 
 	/**
+	 * The feature id for the '<em><b>Modified Date</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_FORMAL_REVIEW__MODIFIED_DATE = R4E_REVIEW__MODIFIED_DATE;
+
+	/**
 	 * The feature id for the '<em><b>Anomaly Template</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -1037,7 +1060,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Spent Time</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1045,7 +1069,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1053,8 +1078,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The number of structural features of the '<em>R4E Review Decision</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1075,7 +1100,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__ID = ModelPackage.USER__ID;
+	int R4E_USER__ID = ReviewsPackage.USER__ID;
 
 	/**
 	 * The feature id for the '<em><b>Email</b></em>' attribute.
@@ -1083,7 +1108,15 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__EMAIL = ModelPackage.USER__EMAIL;
+	int R4E_USER__EMAIL = ReviewsPackage.USER__EMAIL;
+
+	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_USER__DISPLAY_NAME = ReviewsPackage.USER__DISPLAY_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
@@ -1091,7 +1124,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__ENABLED = ModelPackage.USER_FEATURE_COUNT + 0;
+	int R4E_USER__ENABLED = ReviewsPackage.USER_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1100,7 +1133,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__ASSIGNED_TO = ModelPackage.USER_FEATURE_COUNT + 1;
+	int R4E_USER__ASSIGNED_TO = ReviewsPackage.USER_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Group Paths</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1109,7 +1142,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__GROUP_PATHS = ModelPackage.USER_FEATURE_COUNT + 2;
+	int R4E_USER__GROUP_PATHS = ReviewsPackage.USER_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Sequence ID Counter</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1118,7 +1151,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__SEQUENCE_ID_COUNTER = ModelPackage.USER_FEATURE_COUNT + 3;
+	int R4E_USER__SEQUENCE_ID_COUNTER = ReviewsPackage.USER_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Added Comments</b></em>' containment reference list.
@@ -1127,7 +1160,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__ADDED_COMMENTS = ModelPackage.USER_FEATURE_COUNT + 4;
+	int R4E_USER__ADDED_COMMENTS = ReviewsPackage.USER_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Added Items</b></em>' containment reference list.
@@ -1136,7 +1169,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__ADDED_ITEMS = ModelPackage.USER_FEATURE_COUNT + 5;
+	int R4E_USER__ADDED_ITEMS = ReviewsPackage.USER_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Review Created By Me</b></em>' attribute.
@@ -1145,7 +1178,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__REVIEW_CREATED_BY_ME = ModelPackage.USER_FEATURE_COUNT + 6;
+	int R4E_USER__REVIEW_CREATED_BY_ME = ReviewsPackage.USER_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Review Instance</b></em>' reference.
@@ -1153,7 +1186,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__REVIEW_INSTANCE = ModelPackage.USER_FEATURE_COUNT + 7;
+	int R4E_USER__REVIEW_INSTANCE = ReviewsPackage.USER_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Review Completed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1162,7 +1195,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__REVIEW_COMPLETED = ModelPackage.USER_FEATURE_COUNT + 8;
+	int R4E_USER__REVIEW_COMPLETED = ReviewsPackage.USER_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Review Completed Code</b></em>' attribute.
@@ -1171,7 +1204,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER__REVIEW_COMPLETED_CODE = ModelPackage.USER_FEATURE_COUNT + 9;
+	int R4E_USER__REVIEW_COMPLETED_CODE = ReviewsPackage.USER_FEATURE_COUNT + 9;
 
 	/**
 	 * The number of structural features of the '<em>R4E User</em>' class.
@@ -1179,7 +1212,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_USER_FEATURE_COUNT = ModelPackage.USER_FEATURE_COUNT + 10;
+	int R4E_USER_FEATURE_COUNT = ReviewsPackage.USER_FEATURE_COUNT + 10;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EParticipantImpl <em>R4E Participant</em>}' class.
@@ -1207,6 +1240,14 @@ public interface RModelPackage extends EPackage {
 	int R4E_PARTICIPANT__EMAIL = R4E_USER__EMAIL;
 
 	/**
+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_PARTICIPANT__DISPLAY_NAME = R4E_USER__DISPLAY_NAME;
+
+	/**
 	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
@@ -1346,78 +1387,6 @@ public interface RModelPackage extends EPackage {
 	int R4E_PARTICIPANT_FEATURE_COUNT = R4E_USER_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl <em>R4E Item</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EItem()
-	 * @generated
-	 */
-	int R4E_ITEM = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EContentImpl <em>R4E Content</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EContentImpl
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EContent()
-	 * @generated
-	 */
-	int R4E_CONTENT = 20;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ETextContentImpl <em>R4E Text Content</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ETextContentImpl
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4ETextContent()
-	 * @generated
-	 */
-	int R4E_TEXT_CONTENT = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EIDImpl <em>R4EID</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EIDImpl
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EID()
-	 * @generated
-	 */
-	int R4EID = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyTypeImpl <em>R4E Anomaly Type</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyTypeImpl
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EAnomalyType()
-	 * @generated
-	 */
-	int R4E_ANOMALY_TYPE = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ETaskReferenceImpl <em>R4E Task Reference</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ETaskReferenceImpl
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4ETaskReference()
-	 * @generated
-	 */
-	int R4E_TASK_REFERENCE = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewStateImpl <em>R4E Review State</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewStateImpl
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EReviewState()
-	 * @generated
-	 */
-	int R4E_REVIEW_STATE = 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl <em>R4E Comment</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EComment()
-	 * @generated
-	 */
-	int R4E_COMMENT = 14;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewComponentImpl <em>R4E Review Component</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewComponentImpl
@@ -1432,7 +1401,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_COMPONENT__ENABLED = ModelPackage.REVIEW_COMPONENT__ENABLED;
+	int R4E_REVIEW_COMPONENT__ENABLED = ReviewsPackage.REVIEW_COMPONENT__ENABLED;
 
 	/**
 	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1441,7 +1410,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_COMPONENT__ASSIGNED_TO = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
+	int R4E_REVIEW_COMPONENT__ASSIGNED_TO = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>R4E Review Component</em>' class.
@@ -1450,7 +1419,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_COMPONENT_FEATURE_COUNT = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
+	int R4E_REVIEW_COMPONENT_FEATURE_COUNT = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EIDComponentImpl <em>R4EID Component</em>}' class.
@@ -1479,12 +1448,13 @@ public interface RModelPackage extends EPackage {
 	int R4EID_COMPONENT__ASSIGNED_TO = R4E_REVIEW_COMPONENT__ASSIGNED_TO;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>R4e Id</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4EID_COMPONENT__ID = R4E_REVIEW_COMPONENT_FEATURE_COUNT + 0;
+	int R4EID_COMPONENT__R4E_ID = R4E_REVIEW_COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>R4EID Component</em>' class.
@@ -1496,6 +1466,15 @@ public interface RModelPackage extends EPackage {
 	int R4EID_COMPONENT_FEATURE_COUNT = R4E_REVIEW_COMPONENT_FEATURE_COUNT + 1;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl <em>R4E Item</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EItem()
+	 * @generated
+	 */
+	int R4E_ITEM = 8;
+
+	/**
 	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
@@ -1513,12 +1492,13 @@ public interface RModelPackage extends EPackage {
 	int R4E_ITEM__ASSIGNED_TO = R4EID_COMPONENT__ASSIGNED_TO;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>R4e Id</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__ID = R4EID_COMPONENT__ID;
+	int R4E_ITEM__R4E_ID = R4EID_COMPONENT__R4E_ID;
 
 	/**
 	 * The feature id for the '<em><b>Added By</b></em>' reference.
@@ -1537,12 +1517,36 @@ public interface RModelPackage extends EPackage {
 	int R4E_ITEM__REVIEW = R4EID_COMPONENT_FEATURE_COUNT + 1;
 
 	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_ITEM__NAME = R4EID_COMPONENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Topics</b></em>' reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_ITEM__TOPICS = R4EID_COMPONENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_ITEM__ID = R4EID_COMPONENT_FEATURE_COUNT + 4;
+
+	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__DESCRIPTION = R4EID_COMPONENT_FEATURE_COUNT + 2;
+	int R4E_ITEM__DESCRIPTION = R4EID_COMPONENT_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Added By Id</b></em>' attribute.
@@ -1550,7 +1554,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__ADDED_BY_ID = R4EID_COMPONENT_FEATURE_COUNT + 3;
+	int R4E_ITEM__ADDED_BY_ID = R4EID_COMPONENT_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>File Context List</b></em>' containment reference list.
@@ -1559,7 +1563,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__FILE_CONTEXT_LIST = R4EID_COMPONENT_FEATURE_COUNT + 4;
+	int R4E_ITEM__FILE_CONTEXT_LIST = R4EID_COMPONENT_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Repository Ref</b></em>' attribute.
@@ -1567,7 +1571,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__REPOSITORY_REF = R4EID_COMPONENT_FEATURE_COUNT + 5;
+	int R4E_ITEM__REPOSITORY_REF = R4EID_COMPONENT_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Project UR Is</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1576,7 +1580,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__PROJECT_UR_IS = R4EID_COMPONENT_FEATURE_COUNT + 6;
+	int R4E_ITEM__PROJECT_UR_IS = R4EID_COMPONENT_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Author Rep</b></em>' attribute.
@@ -1584,7 +1588,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__AUTHOR_REP = R4EID_COMPONENT_FEATURE_COUNT + 7;
+	int R4E_ITEM__AUTHOR_REP = R4EID_COMPONENT_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Submitted</b></em>' attribute.
@@ -1592,7 +1596,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__SUBMITTED = R4EID_COMPONENT_FEATURE_COUNT + 8;
+	int R4E_ITEM__SUBMITTED = R4EID_COMPONENT_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Info Att</b></em>' map.
@@ -1600,7 +1604,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM__INFO_ATT = R4EID_COMPONENT_FEATURE_COUNT + 9;
+	int R4E_ITEM__INFO_ATT = R4EID_COMPONENT_FEATURE_COUNT + 12;
 
 	/**
 	 * The number of structural features of the '<em>R4E Item</em>' class.
@@ -1608,7 +1612,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ITEM_FEATURE_COUNT = R4EID_COMPONENT_FEATURE_COUNT + 10;
+	int R4E_ITEM_FEATURE_COUNT = R4EID_COMPONENT_FEATURE_COUNT + 13;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EContentImpl <em>R4E Content</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EContentImpl
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EContent()
+	 * @generated
+	 */
+	int R4E_CONTENT = 20;
 
 	/**
 	 * The feature id for the '<em><b>Location</b></em>' containment reference.
@@ -1617,7 +1630,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_CONTENT__LOCATION = ModelPackage.LOCATION_FEATURE_COUNT + 0;
+	int R4E_CONTENT__LOCATION = ReviewsPackage.LOCATION_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Info</b></em>' attribute.
@@ -1625,7 +1638,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_CONTENT__INFO = ModelPackage.LOCATION_FEATURE_COUNT + 1;
+	int R4E_CONTENT__INFO = ReviewsPackage.LOCATION_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>R4E Content</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1634,7 +1647,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_CONTENT_FEATURE_COUNT = ModelPackage.LOCATION_FEATURE_COUNT + 2;
+	int R4E_CONTENT_FEATURE_COUNT = ReviewsPackage.LOCATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ETextContentImpl <em>R4E Text Content</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ETextContentImpl
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4ETextContent()
+	 * @generated
+	 */
+	int R4E_TEXT_CONTENT = 9;
 
 	/**
 	 * The feature id for the '<em><b>Location</b></em>' containment reference.
@@ -1671,6 +1693,15 @@ public interface RModelPackage extends EPackage {
 	int R4E_TEXT_CONTENT_FEATURE_COUNT = R4E_CONTENT_FEATURE_COUNT + 1;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EIDImpl <em>R4EID</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EIDImpl
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EID()
+	 * @generated
+	 */
+	int R4EID = 10;
+
+	/**
 	 * The feature id for the '<em><b>Sequence ID</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
@@ -1695,12 +1726,21 @@ public interface RModelPackage extends EPackage {
 	int R4EID_FEATURE_COUNT = 2;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyTypeImpl <em>R4E Anomaly Type</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyTypeImpl
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EAnomalyType()
+	 * @generated
+	 */
+	int R4E_ANOMALY_TYPE = 11;
+
+	/**
 	 * The feature id for the '<em><b>Type</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY_TYPE__TYPE = ModelPackage.COMMENT_TYPE_FEATURE_COUNT + 0;
+	int R4E_ANOMALY_TYPE__TYPE = ReviewsPackage.COMMENT_TYPE_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>R4E Anomaly Type</em>' class.
@@ -1709,7 +1749,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_ANOMALY_TYPE_FEATURE_COUNT = ModelPackage.COMMENT_TYPE_FEATURE_COUNT + 1;
+	int R4E_ANOMALY_TYPE_FEATURE_COUNT = ReviewsPackage.COMMENT_TYPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ETaskReferenceImpl <em>R4E Task Reference</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ETaskReferenceImpl
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4ETaskReference()
+	 * @generated
+	 */
+	int R4E_TASK_REFERENCE = 12;
 
 	/**
 	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
@@ -1717,7 +1766,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_TASK_REFERENCE__ENABLED = ModelPackage.TASK_REFERENCE__ENABLED;
+	int R4E_TASK_REFERENCE__ENABLED = ReviewsPackage.TASK_REFERENCE__ENABLED;
 
 	/**
 	 * The feature id for the '<em><b>Task Id</b></em>' attribute.
@@ -1725,7 +1774,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_TASK_REFERENCE__TASK_ID = ModelPackage.TASK_REFERENCE__TASK_ID;
+	int R4E_TASK_REFERENCE__TASK_ID = ReviewsPackage.TASK_REFERENCE__TASK_ID;
 
 	/**
 	 * The feature id for the '<em><b>Repository URL</b></em>' attribute.
@@ -1733,7 +1782,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_TASK_REFERENCE__REPOSITORY_URL = ModelPackage.TASK_REFERENCE__REPOSITORY_URL;
+	int R4E_TASK_REFERENCE__REPOSITORY_URL = ReviewsPackage.TASK_REFERENCE__REPOSITORY_URL;
 
 	/**
 	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1742,7 +1791,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_TASK_REFERENCE__ASSIGNED_TO = ModelPackage.TASK_REFERENCE_FEATURE_COUNT + 0;
+	int R4E_TASK_REFERENCE__ASSIGNED_TO = ReviewsPackage.TASK_REFERENCE_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>R4E Task Reference</em>' class.
@@ -1751,7 +1800,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_TASK_REFERENCE_FEATURE_COUNT = ModelPackage.TASK_REFERENCE_FEATURE_COUNT + 1;
+	int R4E_TASK_REFERENCE_FEATURE_COUNT = ReviewsPackage.TASK_REFERENCE_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewStateImpl <em>R4E Review State</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewStateImpl
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EReviewState()
+	 * @generated
+	 */
+	int R4E_REVIEW_STATE = 13;
 
 	/**
 	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
@@ -1759,7 +1817,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_STATE__ENABLED = ModelPackage.REVIEW_STATE__ENABLED;
+	int R4E_REVIEW_STATE__ENABLED = ReviewsPackage.REVIEW_STATE__ENABLED;
 
 	/**
 	 * The feature id for the '<em><b>State</b></em>' attribute.
@@ -1767,7 +1825,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_STATE__STATE = ModelPackage.REVIEW_STATE_FEATURE_COUNT + 0;
+	int R4E_REVIEW_STATE__STATE = ReviewsPackage.REVIEW_STATE_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>R4E Review State</em>' class.
@@ -1776,7 +1834,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_REVIEW_STATE_FEATURE_COUNT = ModelPackage.REVIEW_STATE_FEATURE_COUNT + 1;
+	int R4E_REVIEW_STATE_FEATURE_COUNT = ReviewsPackage.REVIEW_STATE_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl <em>R4E Comment</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EComment()
+	 * @generated
+	 */
+	int R4E_COMMENT = 14;
 
 	/**
 	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
@@ -1784,15 +1851,15 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__ENABLED = ModelPackage.COMMENT__ENABLED;
+	int R4E_COMMENT__ENABLED = ReviewsPackage.COMMENT__ENABLED;
 
 	/**
-	 * The feature id for the '<em><b>User</b></em>' reference.
+	 * The feature id for the '<em><b>Author</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__USER = ModelPackage.COMMENT__USER;
+	int R4E_COMMENT__AUTHOR = ReviewsPackage.COMMENT__AUTHOR;
 
 	/**
 	 * The feature id for the '<em><b>Type</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1801,7 +1868,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__TYPE = ModelPackage.COMMENT__TYPE;
+	int R4E_COMMENT__TYPE = ReviewsPackage.COMMENT__TYPE;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -1809,7 +1876,40 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__DESCRIPTION = ModelPackage.COMMENT__DESCRIPTION;
+	int R4E_COMMENT__DESCRIPTION = ReviewsPackage.COMMENT__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Creation Date</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_COMMENT__CREATION_DATE = ReviewsPackage.COMMENT__CREATION_DATE;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_COMMENT__ID = ReviewsPackage.COMMENT__ID;
+
+	/**
+	 * The feature id for the '<em><b>Replies</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_COMMENT__REPLIES = ReviewsPackage.COMMENT__REPLIES;
+
+	/**
+	 * The feature id for the '<em><b>Draft</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int R4E_COMMENT__DRAFT = ReviewsPackage.COMMENT__DRAFT;
 
 	/**
 	 * The feature id for the '<em><b>Assigned To</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1818,15 +1918,16 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__ASSIGNED_TO = ModelPackage.COMMENT_FEATURE_COUNT + 0;
+	int R4E_COMMENT__ASSIGNED_TO = ReviewsPackage.COMMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>R4e Id</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__ID = ModelPackage.COMMENT_FEATURE_COUNT + 1;
+	int R4E_COMMENT__R4E_ID = ReviewsPackage.COMMENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Created On</b></em>' attribute.
@@ -1834,7 +1935,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__CREATED_ON = ModelPackage.COMMENT_FEATURE_COUNT + 2;
+	int R4E_COMMENT__CREATED_ON = ReviewsPackage.COMMENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Anomaly</b></em>' reference.
@@ -1842,7 +1943,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__ANOMALY = ModelPackage.COMMENT_FEATURE_COUNT + 3;
+	int R4E_COMMENT__ANOMALY = ReviewsPackage.COMMENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Info Att</b></em>' map.
@@ -1850,7 +1951,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT__INFO_ATT = ModelPackage.COMMENT_FEATURE_COUNT + 4;
+	int R4E_COMMENT__INFO_ATT = ReviewsPackage.COMMENT_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of structural features of the '<em>R4E Comment</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1859,7 +1960,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT_FEATURE_COUNT = ModelPackage.COMMENT_FEATURE_COUNT + 5;
+	int R4E_COMMENT_FEATURE_COUNT = ReviewsPackage.COMMENT_FEATURE_COUNT + 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EFileContextImpl <em>R4E File Context</em>}' class.
@@ -1888,12 +1989,13 @@ public interface RModelPackage extends EPackage {
 	int R4E_FILE_CONTEXT__ASSIGNED_TO = R4EID_COMPONENT__ASSIGNED_TO;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>R4e Id</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_FILE_CONTEXT__ID = R4EID_COMPONENT__ID;
+	int R4E_FILE_CONTEXT__R4E_ID = R4EID_COMPONENT__R4E_ID;
 
 	/**
 	 * The feature id for the '<em><b>Deltas</b></em>' containment reference list.
@@ -1974,12 +2076,13 @@ public interface RModelPackage extends EPackage {
 	int R4E_DELTA__ASSIGNED_TO = R4EID_COMPONENT__ASSIGNED_TO;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' containment reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * The feature id for the '<em><b>R4e Id</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DELTA__ID = R4EID_COMPONENT__ID;
+	int R4E_DELTA__R4E_ID = R4EID_COMPONENT__R4E_ID;
 
 	/**
 	 * The feature id for the '<em><b>Base</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
@@ -2023,7 +2126,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT_TYPE__TYPE = ModelPackage.COMMENT_TYPE_FEATURE_COUNT + 0;
+	int R4E_COMMENT_TYPE__TYPE = ReviewsPackage.COMMENT_TYPE_FEATURE_COUNT + 0;
 
 	/**
 	 * The number of structural features of the '<em>R4E Comment Type</em>' class.
@@ -2032,7 +2135,7 @@ public interface RModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_COMMENT_TYPE_FEATURE_COUNT = ModelPackage.COMMENT_TYPE_FEATURE_COUNT + 1;
+	int R4E_COMMENT_TYPE_FEATURE_COUNT = ReviewsPackage.COMMENT_TYPE_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.MapToAnomalyTypeImpl <em>Map To Anomaly Type</em>}' class.
@@ -2467,7 +2570,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewPhaseInfoImpl <em>R4E Review Phase Info</em>}' class.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewPhaseInfoImpl
 	 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EReviewPhaseInfo()
 	 * @generated
@@ -2476,7 +2580,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>End Date</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2484,7 +2589,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2492,7 +2598,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Phase Owner ID</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2500,7 +2607,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The feature id for the '<em><b>Start Date</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2508,8 +2616,8 @@ public interface RModelPackage extends EPackage {
 
 	/**
 	 * The number of structural features of the '<em>R4E Review Phase Info</em>' class.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2931,6 +3039,17 @@ public interface RModelPackage extends EPackage {
 	EAttribute getR4EReview_DueDate();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getModifiedDate <em>Modified Date</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Modified Date</em>'.
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getModifiedDate()
+	 * @see #getR4EReview()
+	 * @generated
+	 */
+	EAttribute getR4EReview_ModifiedDate();
+
+	/**
 	 * Returns the meta object for the containment reference '
 	 * {@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getAnomalyTemplate <em>Anomaly Template</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -2963,6 +3082,17 @@ public interface RModelPackage extends EPackage {
 	EReference getR4EReview_UsersMap();
 
 	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getCreatedBy <em>Created By</em>}'.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Created By</em>'.
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getCreatedBy()
+	 * @see #getR4EReview()
+	 * @generated
+	 */
+	EReference getR4EReview_CreatedBy();
+
+	/**
 	 * Returns the meta object for the map '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getIdsMap <em>Ids Map</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the map '<em>Ids Map</em>'.
@@ -2985,17 +3115,6 @@ public interface RModelPackage extends EPackage {
 	EReference getR4EReview_ActiveMeeting();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getCreatedBy <em>Created By</em>}'.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Created By</em>'.
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.R4EReview#getCreatedBy()
-	 * @see #getR4EReview()
-	 * @generated
-	 */
-	EReference getR4EReview_CreatedBy();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly <em>R4E Anomaly</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>R4E Anomaly</em>'.
@@ -4097,15 +4216,15 @@ public interface RModelPackage extends EPackage {
 	EClass getR4EIDComponent();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Id</em>'.
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent#getId()
+	 * Returns the meta object for the containment reference '{@link org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent#getR4eId <em>R4e Id</em>}'.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>R4e Id</em>'.
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent#getR4eId()
 	 * @see #getR4EIDComponent()
 	 * @generated
 	 */
-	EReference getR4EIDComponent_Id();
+	EReference getR4EIDComponent_R4eId();
 
 	/**
 	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Map ID To Component</em>}'.
@@ -4720,6 +4839,14 @@ public interface RModelPackage extends EPackage {
 		EAttribute R4E_REVIEW__DUE_DATE = eINSTANCE.getR4EReview_DueDate();
 
 		/**
+		 * The meta object literal for the '<em><b>Modified Date</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute R4E_REVIEW__MODIFIED_DATE = eINSTANCE.getR4EReview_ModifiedDate();
+
+		/**
 		 * The meta object literal for the '<em><b>Anomaly Template</b></em>' containment reference feature. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
@@ -4744,6 +4871,14 @@ public interface RModelPackage extends EPackage {
 		EReference R4E_REVIEW__USERS_MAP = eINSTANCE.getR4EReview_UsersMap();
 
 		/**
+		 * The meta object literal for the '<em><b>Created By</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
+		 * @generated
+		 */
+		EReference R4E_REVIEW__CREATED_BY = eINSTANCE.getR4EReview_CreatedBy();
+
+		/**
 		 * The meta object literal for the '<em><b>Ids Map</b></em>' map feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
@@ -4760,14 +4895,6 @@ public interface RModelPackage extends EPackage {
 		EReference R4E_REVIEW__ACTIVE_MEETING = eINSTANCE.getR4EReview_ActiveMeeting();
 
 		/**
-		 * The meta object literal for the '<em><b>Created By</b></em>' reference feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * @generated
-		 */
-		EReference R4E_REVIEW__CREATED_BY = eINSTANCE.getR4EReview_CreatedBy();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl <em>R4E Anomaly</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl
@@ -4949,16 +5076,16 @@ public interface RModelPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '<em><b>Spent Time</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute R4E_REVIEW_DECISION__SPENT_TIME = eINSTANCE.getR4EReviewDecision_SpentTime();
 
 		/**
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute R4E_REVIEW_DECISION__VALUE = eINSTANCE.getR4EReviewDecision_Value();
@@ -5617,12 +5744,12 @@ public interface RModelPackage extends EPackage {
 		EClass R4EID_COMPONENT = eINSTANCE.getR4EIDComponent();
 
 		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The meta object literal for the '<em><b>R4e Id</b></em>' containment reference feature.
+		 * <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference R4EID_COMPONENT__ID = eINSTANCE.getR4EIDComponent_Id();
+		EReference R4EID_COMPONENT__R4E_ID = eINSTANCE.getR4EIDComponent_R4eId();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.MapIDToComponentImpl <em>Map ID To Component</em>}' class.
@@ -5743,7 +5870,8 @@ public interface RModelPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewPhaseInfoImpl <em>R4E Review Phase Info</em>}' class.
-		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewPhaseInfoImpl
 		 * @see org.eclipse.mylyn.reviews.r4e.core.model.impl.RModelPackageImpl#getR4EReviewPhaseInfo()
 		 * @generated
@@ -5752,16 +5880,16 @@ public interface RModelPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '<em><b>End Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute R4E_REVIEW_PHASE_INFO__END_DATE = eINSTANCE.getR4EReviewPhaseInfo_EndDate();
 
 		/**
 		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute R4E_REVIEW_PHASE_INFO__TYPE = eINSTANCE.getR4EReviewPhaseInfo_Type();
@@ -5776,8 +5904,8 @@ public interface RModelPackage extends EPackage {
 
 		/**
 		 * The meta object literal for the '<em><b>Start Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute R4E_REVIEW_PHASE_INFO__START_DATE = eINSTANCE.getR4EReviewPhaseInfo_StartDate();
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/DRModelPackage.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/DRModelPackage.java
index 96078353..459dd94b 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/DRModelPackage.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/DRModelPackage.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 
 /**
  * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
@@ -78,7 +78,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_COLLECTION__ENABLED = ModelPackage.REVIEW_COMPONENT__ENABLED;
+	int R4E_DESIGN_RULE_COLLECTION__ENABLED = ReviewsPackage.REVIEW_COMPONENT__ENABLED;
 
 	/**
 	 * The feature id for the '<em><b>Fragment Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -87,24 +87,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Application Version</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 2;
+	int R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Areas</b></em>' containment reference list.
@@ -113,7 +96,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_COLLECTION__AREAS = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 3;
+	int R4E_DESIGN_RULE_COLLECTION__AREAS = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Version</b></em>' attribute.
@@ -121,7 +104,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_COLLECTION__VERSION = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 4;
+	int R4E_DESIGN_RULE_COLLECTION__VERSION = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Folder</b></em>' attribute.
@@ -129,7 +112,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_COLLECTION__FOLDER = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 5;
+	int R4E_DESIGN_RULE_COLLECTION__FOLDER = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -137,7 +120,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_COLLECTION__NAME = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 6;
+	int R4E_DESIGN_RULE_COLLECTION__NAME = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of structural features of the '<em>R4E Design Rule Collection</em>' class.
@@ -146,7 +129,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_COLLECTION_FEATURE_COUNT = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 7;
+	int R4E_DESIGN_RULE_COLLECTION_FEATURE_COUNT = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleImpl <em>R4E Design Rule</em>}' class.
@@ -163,7 +146,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE__ENABLED = ModelPackage.REVIEW_COMPONENT__ENABLED;
+	int R4E_DESIGN_RULE__ENABLED = ReviewsPackage.REVIEW_COMPONENT__ENABLED;
 
 	/**
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
@@ -171,7 +154,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE__ID = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
+	int R4E_DESIGN_RULE__ID = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Rank</b></em>' attribute.
@@ -179,7 +162,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE__RANK = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
+	int R4E_DESIGN_RULE__RANK = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Class</b></em>' attribute.
@@ -187,7 +170,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE__CLASS = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 2;
+	int R4E_DESIGN_RULE__CLASS = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Title</b></em>' attribute.
@@ -195,7 +178,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE__TITLE = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 3;
+	int R4E_DESIGN_RULE__TITLE = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Description</b></em>' attribute.
@@ -203,7 +186,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE__DESCRIPTION = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 4;
+	int R4E_DESIGN_RULE__DESCRIPTION = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of structural features of the '<em>R4E Design Rule</em>' class.
@@ -212,7 +195,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_FEATURE_COUNT = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 5;
+	int R4E_DESIGN_RULE_FEATURE_COUNT = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleAreaImpl <em>R4E Design Rule Area</em>}' class.
@@ -229,7 +212,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_AREA__ENABLED = ModelPackage.REVIEW_COMPONENT__ENABLED;
+	int R4E_DESIGN_RULE_AREA__ENABLED = ReviewsPackage.REVIEW_COMPONENT__ENABLED;
 
 	/**
 	 * The feature id for the '<em><b>Violations</b></em>' containment reference list.
@@ -238,7 +221,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_AREA__VIOLATIONS = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
+	int R4E_DESIGN_RULE_AREA__VIOLATIONS = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -246,7 +229,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_AREA__NAME = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
+	int R4E_DESIGN_RULE_AREA__NAME = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>R4E Design Rule Area</em>' class.
@@ -255,7 +238,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_AREA_FEATURE_COUNT = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 2;
+	int R4E_DESIGN_RULE_AREA_FEATURE_COUNT = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleViolationImpl <em>R4E Design Rule Violation</em>}' class.
@@ -272,7 +255,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_VIOLATION__ENABLED = ModelPackage.REVIEW_COMPONENT__ENABLED;
+	int R4E_DESIGN_RULE_VIOLATION__ENABLED = ReviewsPackage.REVIEW_COMPONENT__ENABLED;
 
 	/**
 	 * The feature id for the '<em><b>Rules</b></em>' containment reference list.
@@ -281,7 +264,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_VIOLATION__RULES = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
+	int R4E_DESIGN_RULE_VIOLATION__RULES = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -289,7 +272,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_VIOLATION__NAME = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
+	int R4E_DESIGN_RULE_VIOLATION__NAME = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>R4E Design Rule Violation</em>' class.
@@ -298,7 +281,7 @@ public interface DRModelPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int R4E_DESIGN_RULE_VIOLATION_FEATURE_COUNT = ModelPackage.REVIEW_COMPONENT_FEATURE_COUNT + 2;
+	int R4E_DESIGN_RULE_VIOLATION_FEATURE_COUNT = ReviewsPackage.REVIEW_COMPONENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleRank <em>R4E Design Rule Rank</em>}' enum.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRule.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRule.java
index a2c9850d..2ac18d9e 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRule.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRule.java
@@ -14,7 +14,7 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules;
 
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Design Rule</b></em>'. <!-- end-user-doc -->
@@ -34,7 +34,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
  * @model
  * @generated
  */
-public interface R4EDesignRule extends ReviewComponent {
+public interface R4EDesignRule extends IReviewComponent {
 	/**
 	 * Returns the value of the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleArea.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleArea.java
index cf1be0e8..4584a4d3 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleArea.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleArea.java
@@ -14,8 +14,9 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import java.util.List;
+
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Design Rule Area</b></em>'. <!--
@@ -33,7 +34,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
  * @model
  * @generated
  */
-public interface R4EDesignRuleArea extends ReviewComponent {
+public interface R4EDesignRuleArea extends IReviewComponent {
 	/**
 	 * Returns the value of the '<em><b>Violations</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation}.
@@ -48,7 +49,7 @@ public interface R4EDesignRuleArea extends ReviewComponent {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EDesignRuleViolation> getViolations();
+	List<R4EDesignRuleViolation> getViolations();
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleClass.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleClass.java
index 95892eb3..5e2d001d 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleClass.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleClass.java
@@ -9,7 +9,7 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules;
@@ -29,142 +29,144 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum R4EDesignRuleClass implements Enumerator {
 	/**
-	 * The '<em><b>R4E CLASS ERRONEOUS</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_CLASS_ERRONEOUS_VALUE
+	 * The '<em><b>Erroneous</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ERRONEOUS_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_CLASS_ERRONEOUS(0, "R4E_CLASS_ERRONEOUS", "R4E_CLASS_ERRONEOUS"),
-
-	/**
-	 * The '<em><b>R4E CLASS SUPERFLUOUS</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_CLASS_SUPERFLUOUS_VALUE
+	ERRONEOUS(0, "Erroneous", "ERRONEOUS"), /**
+	 * The '<em><b>Superfluous</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SUPERFLUOUS_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_CLASS_SUPERFLUOUS(1, "R4E_CLASS_SUPERFLUOUS", "R4E_CLASS_SUPERFLUOUS"), /**
-	 * The '<em><b>R4E CLASS IMPROVEMENT</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_CLASS_IMPROVEMENT_VALUE
+	SUPERFLUOUS(1, "Superfluous", "SUPERFLUOUS"), /**
+	 * The '<em><b>Improvement</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #IMPROVEMENT_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_CLASS_IMPROVEMENT(2, "R4E_CLASS_IMPROVEMENT", "R4E_CLASS_IMPROVEMENT"),
-
-	/**
-	 * The '<em><b>R4E CLASS QUESTION</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_CLASS_QUESTION_VALUE
+	IMPROVEMENT(2, "Improvement", "IMPROVEMENT"), /**
+	 * The '<em><b>Question</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #QUESTION_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_CLASS_QUESTION(3, "R4E_CLASS_QUESTION", "R4E_CLASS_QUESTION"), /**
-	 * The '<em><b>R4E CLASS COMMENT</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_CLASS_COMMENT_VALUE
+	QUESTION(3, "Question", "QUESTION"), /**
+	 * The '<em><b>Comment</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #COMMENT_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_CLASS_COMMENT(4, "R4E_CLASS_COMMENT", "R4E_CLASS_COMMENT"), /**
-	 * The '<em><b>R4E CLASS MISSING</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_CLASS_MISSING_VALUE
+	COMMENT(4, "Comment", "COMMENT"), /**
+	 * The '<em><b>Missing</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MISSING_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_CLASS_MISSING(5, "R4E_CLASS_MISSING", "R4E_CLASS_MISSING");
+	MISSING(5, "Missing", "MISSING");
 
 	/**
-	 * The '<em><b>R4E CLASS ERRONEOUS</b></em>' literal value.
+	 * The '<em><b>Erroneous</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E CLASS ERRONEOUS</b></em>' literal object isn't clear, there really should be more
-	 * of a description here...
+	 * If the meaning of '<em><b>Erroneous</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_CLASS_ERRONEOUS
-	 * @model
+	 * @see #ERRONEOUS
+	 * @model name="Erroneous" literal="ERRONEOUS"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_CLASS_ERRONEOUS_VALUE = 0;
+	public static final int ERRONEOUS_VALUE = 0;
 
 	/**
-	 * The '<em><b>R4E CLASS SUPERFLUOUS</b></em>' literal value.
+	 * The '<em><b>Superfluous</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E CLASS SUPERFLUOUS</b></em>' literal object isn't clear, there really should be more
-	 * of a description here...
+	 * If the meaning of '<em><b>Superfluous</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_CLASS_SUPERFLUOUS
-	 * @model
+	 * @see #SUPERFLUOUS
+	 * @model name="Superfluous" literal="SUPERFLUOUS"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_CLASS_SUPERFLUOUS_VALUE = 1;
+	public static final int SUPERFLUOUS_VALUE = 1;
 
 	/**
-	 * The '<em><b>R4E CLASS IMPROVEMENT</b></em>' literal value.
+	 * The '<em><b>Improvement</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E CLASS IMPROVEMENT</b></em>' literal object isn't clear, there really should be more
-	 * of a description here...
+	 * If the meaning of '<em><b>Improvement</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_CLASS_IMPROVEMENT
-	 * @model
+	 * @see #IMPROVEMENT
+	 * @model name="Improvement" literal="IMPROVEMENT"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_CLASS_IMPROVEMENT_VALUE = 2;
+	public static final int IMPROVEMENT_VALUE = 2;
 
 	/**
-	 * The '<em><b>R4E CLASS QUESTION</b></em>' literal value.
+	 * The '<em><b>Question</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E CLASS QUESTION</b></em>' literal object isn't clear, there really should be more of
-	 * a description here...
+	 * If the meaning of '<em><b>Question</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_CLASS_QUESTION
-	 * @model
+	 * @see #QUESTION
+	 * @model name="Question" literal="QUESTION"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_CLASS_QUESTION_VALUE = 3;
+	public static final int QUESTION_VALUE = 3;
 
 	/**
-	 * The '<em><b>R4E CLASS COMMENT</b></em>' literal value.
+	 * The '<em><b>Comment</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E CLASS COMMENT</b></em>' literal object isn't clear, there really should be more of
-	 * a description here...
+	 * If the meaning of '<em><b>Comment</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_CLASS_COMMENT
-	 * @model
+	 * @see #COMMENT
+	 * @model name="Comment" literal="COMMENT"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_CLASS_COMMENT_VALUE = 4;
+	public static final int COMMENT_VALUE = 4;
 
 	/**
-	 * The '<em><b>R4E CLASS MISSING</b></em>' literal value.
+	 * The '<em><b>Missing</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E CLASS MISSING</b></em>' literal object isn't clear, there really should be more of
-	 * a description here...
+	 * If the meaning of '<em><b>Missing</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_CLASS_MISSING
-	 * @model
+	 * @see #MISSING
+	 * @model name="Missing" literal="MISSING"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_CLASS_MISSING_VALUE = 5;
+	public static final int MISSING_VALUE = 5;
 
 	/**
 	 * An array of all the '<em><b>R4E Design Rule Class</b></em>' enumerators.
@@ -173,12 +175,12 @@ public enum R4EDesignRuleClass implements Enumerator {
 	 * @generated
 	 */
 	private static final R4EDesignRuleClass[] VALUES_ARRAY = new R4EDesignRuleClass[] {
-			R4E_CLASS_ERRONEOUS,
-			R4E_CLASS_SUPERFLUOUS,
-			R4E_CLASS_IMPROVEMENT,
-			R4E_CLASS_QUESTION,
-			R4E_CLASS_COMMENT,
-			R4E_CLASS_MISSING,
+			ERRONEOUS,
+			SUPERFLUOUS,
+			IMPROVEMENT,
+			QUESTION,
+			COMMENT,
+			MISSING,
 		};
 
 	/**
@@ -229,12 +231,12 @@ public enum R4EDesignRuleClass implements Enumerator {
 	 */
 	public static R4EDesignRuleClass get(int value) {
 		switch (value) {
-			case R4E_CLASS_ERRONEOUS_VALUE: return R4E_CLASS_ERRONEOUS;
-			case R4E_CLASS_SUPERFLUOUS_VALUE: return R4E_CLASS_SUPERFLUOUS;
-			case R4E_CLASS_IMPROVEMENT_VALUE: return R4E_CLASS_IMPROVEMENT;
-			case R4E_CLASS_QUESTION_VALUE: return R4E_CLASS_QUESTION;
-			case R4E_CLASS_COMMENT_VALUE: return R4E_CLASS_COMMENT;
-			case R4E_CLASS_MISSING_VALUE: return R4E_CLASS_MISSING;
+			case ERRONEOUS_VALUE: return ERRONEOUS;
+			case SUPERFLUOUS_VALUE: return SUPERFLUOUS;
+			case IMPROVEMENT_VALUE: return IMPROVEMENT;
+			case QUESTION_VALUE: return QUESTION;
+			case COMMENT_VALUE: return COMMENT;
+			case MISSING_VALUE: return MISSING;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleCollection.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleCollection.java
index 52d0636a..5cd23695 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleCollection.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleCollection.java
@@ -14,9 +14,10 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
+import java.util.List;
+
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Design Rule Collection</b></em>'. <!--
@@ -36,7 +37,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
  * @model
  * @generated
  */
-public interface R4EDesignRuleCollection extends ReviewComponent, SubModelRoot {
+public interface R4EDesignRuleCollection extends IReviewComponent, IModelVersioning {
 	/**
 	 * Returns the value of the '<em><b>Areas</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea}.
@@ -51,7 +52,7 @@ public interface R4EDesignRuleCollection extends ReviewComponent, SubModelRoot {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EDesignRuleArea> getAreas();
+	List<R4EDesignRuleArea> getAreas();
 
 	/**
 	 * Returns the value of the '<em><b>Version</b></em>' attribute.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleRank.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleRank.java
index 0e3d3502..df19847d 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleRank.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleRank.java
@@ -9,7 +9,7 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules;
@@ -29,98 +29,98 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum R4EDesignRuleRank implements Enumerator {
 	/**
-	 * The '<em><b>R4E RANK NONE</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_RANK_NONE_VALUE
+	 * The '<em><b>None</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_RANK_NONE(0, "R4E_RANK_NONE", "R4E_RANK_NONE"),
-
-	/**
-	 * The '<em><b>R4E RANK MINOR</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_RANK_MINOR_VALUE
+	NONE(0, "None", "NONE"), /**
+	 * The '<em><b>Minor</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MINOR_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_RANK_MINOR(1, "R4E_RANK_MINOR", "R4E_RANK_MINOR"),
-
-	/**
-	 * The '<em><b>R4E RANK MAJOR</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_RANK_MAJOR_VALUE
+	MINOR(1, "Minor", "MINOR"), /**
+	 * The '<em><b>Major</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MAJOR_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_RANK_MAJOR(2, "R4E_RANK_MAJOR", "R4E_RANK_MAJOR"), /**
-	 * The '<em><b>R4E RANK DEPRECATED</b></em>' literal object.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @see #R4E_RANK_DEPRECATED_VALUE
+	MAJOR(2, "Major", "MAJOR"), /**
+	 * The '<em><b>Deprecated</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #DEPRECATED_VALUE
 	 * @generated
 	 * @ordered
 	 */
-	R4E_RANK_DEPRECATED(3, "R4E_RANK_DEPRECATED", "");
+	DEPRECATED(3, "Deprecated", "DEPRECATED");
 
 	/**
-	 * The '<em><b>R4E RANK NONE</b></em>' literal value.
+	 * The '<em><b>None</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E RANK NONE</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_RANK_NONE
-	 * @model
+	 * @see #NONE
+	 * @model name="None" literal="NONE"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_RANK_NONE_VALUE = 0;
+	public static final int NONE_VALUE = 0;
 
 	/**
-	 * The '<em><b>R4E RANK MINOR</b></em>' literal value.
+	 * The '<em><b>Minor</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E RANK MINOR</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Minor</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_RANK_MINOR
-	 * @model
+	 * @see #MINOR
+	 * @model name="Minor" literal="MINOR"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_RANK_MINOR_VALUE = 1;
+	public static final int MINOR_VALUE = 1;
 
 	/**
-	 * The '<em><b>R4E RANK MAJOR</b></em>' literal value.
+	 * The '<em><b>Major</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E RANK MAJOR</b></em>' literal object isn't clear, there really should be more of a
-	 * description here...
+	 * If the meaning of '<em><b>Major</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_RANK_MAJOR
-	 * @model
+	 * @see #MAJOR
+	 * @model name="Major" literal="MAJOR"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_RANK_MAJOR_VALUE = 2;
+	public static final int MAJOR_VALUE = 2;
 
 	/**
-	 * The '<em><b>R4E RANK DEPRECATED</b></em>' literal value.
+	 * The '<em><b>Deprecated</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>R4E RANK DEPRECATED</b></em>' literal object isn't clear, there really should be more
-	 * of a description here...
+	 * If the meaning of '<em><b>Deprecated</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #R4E_RANK_DEPRECATED
-	 * @model literal=""
+	 * @see #DEPRECATED
+	 * @model name="Deprecated" literal="DEPRECATED"
 	 * @generated
 	 * @ordered
 	 */
-	public static final int R4E_RANK_DEPRECATED_VALUE = 3;
+	public static final int DEPRECATED_VALUE = 3;
 
 	/**
 	 * An array of all the '<em><b>R4E Design Rule Rank</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc
@@ -129,10 +129,10 @@ public enum R4EDesignRuleRank implements Enumerator {
 	 * @generated
 	 */
 	private static final R4EDesignRuleRank[] VALUES_ARRAY = new R4EDesignRuleRank[] {
-			R4E_RANK_NONE,
-			R4E_RANK_MINOR,
-			R4E_RANK_MAJOR,
-			R4E_RANK_DEPRECATED,
+			NONE,
+			MINOR,
+			MAJOR,
+			DEPRECATED,
 		};
 
 	/**
@@ -183,10 +183,10 @@ public enum R4EDesignRuleRank implements Enumerator {
 	 */
 	public static R4EDesignRuleRank get(int value) {
 		switch (value) {
-			case R4E_RANK_NONE_VALUE: return R4E_RANK_NONE;
-			case R4E_RANK_MINOR_VALUE: return R4E_RANK_MINOR;
-			case R4E_RANK_MAJOR_VALUE: return R4E_RANK_MAJOR;
-			case R4E_RANK_DEPRECATED_VALUE: return R4E_RANK_DEPRECATED;
+			case NONE_VALUE: return NONE;
+			case MINOR_VALUE: return MINOR;
+			case MAJOR_VALUE: return MAJOR;
+			case DEPRECATED_VALUE: return DEPRECATED;
 		}
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleViolation.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleViolation.java
index a819be91..c9bef3c2 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleViolation.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/R4EDesignRuleViolation.java
@@ -14,8 +14,9 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import java.util.List;
+
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>R4E Design Rule Violation</b></em>'. <!--
@@ -33,7 +34,7 @@ import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
  * @model
  * @generated
  */
-public interface R4EDesignRuleViolation extends ReviewComponent {
+public interface R4EDesignRuleViolation extends IReviewComponent {
 	/**
 	 * Returns the value of the '<em><b>Rules</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule}.
@@ -48,7 +49,7 @@ public interface R4EDesignRuleViolation extends ReviewComponent {
 	 * @model containment="true" resolveProxies="true"
 	 * @generated
 	 */
-	EList<R4EDesignRule> getRules();
+	List<R4EDesignRule> getRules();
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/DRModelFactoryImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/DRModelFactoryImpl.java
index 42bf2134..5a38a188 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/DRModelFactoryImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/DRModelFactoryImpl.java
@@ -9,7 +9,7 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;
@@ -18,12 +18,16 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.mylyn.reviews.r4e.core.model.drules.*;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelFactory;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleClass;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleCollection;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleRank;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/DRModelPackageImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/DRModelPackageImpl.java
index 5ab4044f..f0a0df92 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/DRModelPackageImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/DRModelPackageImpl.java
@@ -9,7 +9,7 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelFactory;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
@@ -115,7 +115,7 @@ public class DRModelPackageImpl extends EPackageImpl implements DRModelPackage {
 		isInited = true;
 
 		// Initialize simple dependencies
-		ModelPackage.eINSTANCE.eClass();
+		ReviewsPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theDRModelPackage.createPackageContents();
@@ -357,18 +357,18 @@ public class DRModelPackageImpl extends EPackageImpl implements DRModelPackage {
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		ModelPackage theModelPackage = (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
+		ReviewsPackage theReviewsPackage = (ReviewsPackage)EPackage.Registry.INSTANCE.getEPackage(ReviewsPackage.eNS_URI);
 
 		// Create type parameters
 
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		r4EDesignRuleCollectionEClass.getESuperTypes().add(theModelPackage.getReviewComponent());
-		r4EDesignRuleCollectionEClass.getESuperTypes().add(theModelPackage.getSubModelRoot());
-		r4EDesignRuleEClass.getESuperTypes().add(theModelPackage.getReviewComponent());
-		r4EDesignRuleAreaEClass.getESuperTypes().add(theModelPackage.getReviewComponent());
-		r4EDesignRuleViolationEClass.getESuperTypes().add(theModelPackage.getReviewComponent());
+		r4EDesignRuleCollectionEClass.getESuperTypes().add(theReviewsPackage.getReviewComponent());
+		r4EDesignRuleCollectionEClass.getESuperTypes().add(theReviewsPackage.getModelVersioning());
+		r4EDesignRuleEClass.getESuperTypes().add(theReviewsPackage.getReviewComponent());
+		r4EDesignRuleAreaEClass.getESuperTypes().add(theReviewsPackage.getReviewComponent());
+		r4EDesignRuleViolationEClass.getESuperTypes().add(theReviewsPackage.getReviewComponent());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(r4EDesignRuleCollectionEClass, R4EDesignRuleCollection.class, "R4EDesignRuleCollection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -394,18 +394,18 @@ public class DRModelPackageImpl extends EPackageImpl implements DRModelPackage {
 
 		// Initialize enums and add enum literals
 		initEEnum(r4EDesignRuleRankEEnum, R4EDesignRuleRank.class, "R4EDesignRuleRank");
-		addEEnumLiteral(r4EDesignRuleRankEEnum, R4EDesignRuleRank.R4E_RANK_NONE);
-		addEEnumLiteral(r4EDesignRuleRankEEnum, R4EDesignRuleRank.R4E_RANK_MINOR);
-		addEEnumLiteral(r4EDesignRuleRankEEnum, R4EDesignRuleRank.R4E_RANK_MAJOR);
-		addEEnumLiteral(r4EDesignRuleRankEEnum, R4EDesignRuleRank.R4E_RANK_DEPRECATED);
+		addEEnumLiteral(r4EDesignRuleRankEEnum, R4EDesignRuleRank.NONE);
+		addEEnumLiteral(r4EDesignRuleRankEEnum, R4EDesignRuleRank.MINOR);
+		addEEnumLiteral(r4EDesignRuleRankEEnum, R4EDesignRuleRank.MAJOR);
+		addEEnumLiteral(r4EDesignRuleRankEEnum, R4EDesignRuleRank.DEPRECATED);
 
 		initEEnum(r4EDesignRuleClassEEnum, R4EDesignRuleClass.class, "R4EDesignRuleClass");
-		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.R4E_CLASS_ERRONEOUS);
-		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.R4E_CLASS_SUPERFLUOUS);
-		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.R4E_CLASS_IMPROVEMENT);
-		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.R4E_CLASS_QUESTION);
-		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.R4E_CLASS_COMMENT);
-		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.R4E_CLASS_MISSING);
+		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.ERRONEOUS);
+		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.SUPERFLUOUS);
+		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.IMPROVEMENT);
+		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.QUESTION);
+		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.COMMENT);
+		addEEnumLiteral(r4EDesignRuleClassEEnum, R4EDesignRuleClass.MISSING);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleAreaImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleAreaImpl.java
index 681b6945..8d81017c 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleAreaImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleAreaImpl.java
@@ -9,12 +9,13 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;
 
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -24,7 +25,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
@@ -42,7 +43,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
  *
  * @generated
  */
-public class R4EDesignRuleAreaImpl extends ReviewComponentImpl implements R4EDesignRuleArea {
+public class R4EDesignRuleAreaImpl extends ReviewComponent implements R4EDesignRuleArea {
 	/**
 	 * The cached value of the '{@link #getViolations() <em>Violations</em>}' containment reference list. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -94,7 +95,7 @@ public class R4EDesignRuleAreaImpl extends ReviewComponentImpl implements R4EDes
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EDesignRuleViolation> getViolations() {
+	public List<R4EDesignRuleViolation> getViolations() {
 		if (violations == null) {
 			violations = new EObjectContainmentEList.Resolving<R4EDesignRuleViolation>(R4EDesignRuleViolation.class, this, DRModelPackage.R4E_DESIGN_RULE_AREA__VIOLATIONS);
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleCollectionImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleCollectionImpl.java
index c2fe8bcd..281bc806 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleCollectionImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleCollectionImpl.java
@@ -9,12 +9,13 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;
 
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -24,15 +25,12 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleCollection;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.Roots;
-import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>R4E Design Rule Collection</b></em>'. <!--
@@ -41,8 +39,6 @@ import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleCollectionImpl#getFragmentVersion <em>Fragment Version</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleCollectionImpl#getCompatibility <em>Compatibility</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleCollectionImpl#getApplicationVersion <em>Application Version</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleCollectionImpl#getAreas <em>Areas</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleCollectionImpl#getVersion <em>Version</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleCollectionImpl#getFolder <em>Folder</em>}</li>
@@ -52,7 +48,7 @@ import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
  *
  * @generated
  */
-public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements R4EDesignRuleCollection {
+public class R4EDesignRuleCollectionImpl extends ReviewComponent implements R4EDesignRuleCollection {
 	/**
 	 * The default value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
 	 * <!-- begin-user-doc
@@ -61,7 +57,7 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String FRAGMENT_VERSION_EDEFAULT = "0.8.0";
+	protected static final String FRAGMENT_VERSION_EDEFAULT = "1.0.0";
 
 	/**
 	 * The cached value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
@@ -74,62 +70,6 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 	protected String fragmentVersion = FRAGMENT_VERSION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getCompatibility() <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompatibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int COMPATIBILITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getCompatibility() <em>Compatibility</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompatibility()
-	 * @generated
-	 * @ordered
-	 */
-	protected int compatibility = COMPATIBILITY_EDEFAULT;
-
-	/**
-	 * This is true if the Compatibility attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean compatibilityESet;
-
-	/**
-	 * The default value of the '{@link #getApplicationVersion() <em>Application Version</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getApplicationVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String APPLICATION_VERSION_EDEFAULT = "1.0.0";
-
-	/**
-	 * The cached value of the '{@link #getApplicationVersion() <em>Application Version</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getApplicationVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String applicationVersion = APPLICATION_VERSION_EDEFAULT;
-
-	/**
-	 * This is true if the Application Version attribute has been set.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean applicationVersionESet;
-
-	/**
 	 * The cached value of the '{@link #getAreas() <em>Areas</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -235,97 +175,11 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 			eNotify(new ENotificationImpl(this, Notification.SET, DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION, oldFragmentVersion, fragmentVersion));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getCompatibility()
-	 */
-	public int getCompatibility() {
-		return VersionUtils.compareVersions(Roots.RULESET.getVersion(), fragmentVersion);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot#getApplicationVersion()
-	 */
-	public String getApplicationVersion() {
-		return Persistence.Roots.RULESET.getVersion();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCompatibility(int newCompatibility) {
-		int oldCompatibility = compatibility;
-		compatibility = newCompatibility;
-		boolean oldCompatibilityESet = compatibilityESet;
-		compatibilityESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DRModelPackage.R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY, oldCompatibility, compatibility, !oldCompatibilityESet));
-	}
-
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void unsetCompatibility() {
-		int oldCompatibility = compatibility;
-		boolean oldCompatibilityESet = compatibilityESet;
-		compatibility = COMPATIBILITY_EDEFAULT;
-		compatibilityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, DRModelPackage.R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY, oldCompatibility, COMPATIBILITY_EDEFAULT, oldCompatibilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetCompatibility() {
-		return compatibilityESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setApplicationVersion(String newApplicationVersion) {
-		String oldApplicationVersion = applicationVersion;
-		applicationVersion = newApplicationVersion;
-		boolean oldApplicationVersionESet = applicationVersionESet;
-		applicationVersionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DRModelPackage.R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION, oldApplicationVersion, applicationVersion, !oldApplicationVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetApplicationVersion() {
-		String oldApplicationVersion = applicationVersion;
-		boolean oldApplicationVersionESet = applicationVersionESet;
-		applicationVersion = APPLICATION_VERSION_EDEFAULT;
-		applicationVersionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, DRModelPackage.R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION, oldApplicationVersion, APPLICATION_VERSION_EDEFAULT, oldApplicationVersionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetApplicationVersion() {
-		return applicationVersionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<R4EDesignRuleArea> getAreas() {
+	public List<R4EDesignRuleArea> getAreas() {
 		if (areas == null) {
 			areas = new EObjectContainmentEList.Resolving<R4EDesignRuleArea>(R4EDesignRuleArea.class, this, DRModelPackage.R4E_DESIGN_RULE_COLLECTION__AREAS);
 		}
@@ -411,10 +265,6 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 		switch (featureID) {
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION:
 				return getFragmentVersion();
-			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY:
-				return getCompatibility();
-			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION:
-				return getApplicationVersion();
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__AREAS:
 				return getAreas();
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__VERSION:
@@ -438,12 +288,6 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION:
 				setFragmentVersion((String)newValue);
 				return;
-			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY:
-				setCompatibility((Integer)newValue);
-				return;
-			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION:
-				setApplicationVersion((String)newValue);
-				return;
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__AREAS:
 				getAreas().clear();
 				getAreas().addAll((Collection<? extends R4EDesignRuleArea>)newValue);
@@ -471,12 +315,6 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION:
 				setFragmentVersion(FRAGMENT_VERSION_EDEFAULT);
 				return;
-			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY:
-				unsetCompatibility();
-				return;
-			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION:
-				unsetApplicationVersion();
-				return;
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__AREAS:
 				getAreas().clear();
 				return;
@@ -502,10 +340,6 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 		switch (featureID) {
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION:
 				return FRAGMENT_VERSION_EDEFAULT == null ? fragmentVersion != null : !FRAGMENT_VERSION_EDEFAULT.equals(fragmentVersion);
-			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY:
-				return isSetCompatibility();
-			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION:
-				return isSetApplicationVersion();
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__AREAS:
 				return areas != null && !areas.isEmpty();
 			case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__VERSION:
@@ -524,11 +358,9 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == SubModelRoot.class) {
+		if (baseClass == IModelVersioning.class) {
 			switch (derivedFeatureID) {
-				case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION: return ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION;
-				case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY: return ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY;
-				case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION: return ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION;
+				case DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION: return ReviewsPackage.MODEL_VERSIONING__FRAGMENT_VERSION;
 				default: return -1;
 			}
 		}
@@ -541,11 +373,9 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == SubModelRoot.class) {
+		if (baseClass == IModelVersioning.class) {
 			switch (baseFeatureID) {
-				case ModelPackage.SUB_MODEL_ROOT__FRAGMENT_VERSION: return DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION;
-				case ModelPackage.SUB_MODEL_ROOT__COMPATIBILITY: return DRModelPackage.R4E_DESIGN_RULE_COLLECTION__COMPATIBILITY;
-				case ModelPackage.SUB_MODEL_ROOT__APPLICATION_VERSION: return DRModelPackage.R4E_DESIGN_RULE_COLLECTION__APPLICATION_VERSION;
+				case ReviewsPackage.MODEL_VERSIONING__FRAGMENT_VERSION: return DRModelPackage.R4E_DESIGN_RULE_COLLECTION__FRAGMENT_VERSION;
 				default: return -1;
 			}
 		}
@@ -563,10 +393,6 @@ public class R4EDesignRuleCollectionImpl extends ReviewComponentImpl implements
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fragmentVersion: ");
 		result.append(fragmentVersion);
-		result.append(", compatibility: ");
-		if (compatibilityESet) result.append(compatibility); else result.append("<unset>");
-		result.append(", applicationVersion: ");
-		if (applicationVersionESet) result.append(applicationVersion); else result.append("<unset>");
 		result.append(", version: ");
 		result.append(version);
 		result.append(", folder: ");
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleImpl.java
index a49192b3..6e989117 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleImpl.java
@@ -9,7 +9,7 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;
@@ -17,7 +17,7 @@ package org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleClass;
@@ -40,7 +40,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleRank;
  * 
  * @generated
  */
-public class R4EDesignRuleImpl extends ReviewComponentImpl implements R4EDesignRule {
+public class R4EDesignRuleImpl extends ReviewComponent implements R4EDesignRule {
 	/**
 	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -67,7 +67,7 @@ public class R4EDesignRuleImpl extends ReviewComponentImpl implements R4EDesignR
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EDesignRuleRank RANK_EDEFAULT = R4EDesignRuleRank.R4E_RANK_NONE;
+	protected static final R4EDesignRuleRank RANK_EDEFAULT = R4EDesignRuleRank.NONE;
 
 	/**
 	 * The cached value of the '{@link #getRank() <em>Rank</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -87,7 +87,7 @@ public class R4EDesignRuleImpl extends ReviewComponentImpl implements R4EDesignR
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EDesignRuleClass CLASS_EDEFAULT = R4EDesignRuleClass.R4E_CLASS_ERRONEOUS;
+	protected static final R4EDesignRuleClass CLASS_EDEFAULT = R4EDesignRuleClass.ERRONEOUS;
 
 	/**
 	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleViolationImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleViolationImpl.java
index 2113a392..cbc428f6 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleViolationImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/impl/R4EDesignRuleViolationImpl.java
@@ -9,12 +9,13 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules.impl;
 
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -24,7 +25,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
@@ -42,7 +43,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
  *
  * @generated
  */
-public class R4EDesignRuleViolationImpl extends ReviewComponentImpl implements R4EDesignRuleViolation {
+public class R4EDesignRuleViolationImpl extends ReviewComponent implements R4EDesignRuleViolation {
 	/**
 	 * The cached value of the '{@link #getRules() <em>Rules</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -94,7 +95,7 @@ public class R4EDesignRuleViolationImpl extends ReviewComponentImpl implements R
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EDesignRule> getRules() {
+	public List<R4EDesignRule> getRules() {
 		if (rules == null) {
 			rules = new EObjectContainmentEList.Resolving<R4EDesignRule>(R4EDesignRule.class, this, DRModelPackage.R4E_DESIGN_RULE_VIOLATION__RULES);
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelAdapterFactory.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelAdapterFactory.java
index 88088273..0f44d295 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelAdapterFactory.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelAdapterFactory.java
@@ -9,21 +9,22 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-import org.eclipse.mylyn.reviews.r4e.core.model.drules.*;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleCollection;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
 
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
@@ -92,12 +93,12 @@ public class DRModelAdapterFactory extends AdapterFactoryImpl {
 				return createR4EDesignRuleViolationAdapter();
 			}
 			@Override
-			public Adapter caseReviewComponent(ReviewComponent object) {
+			public Adapter caseReviewComponent(IReviewComponent object) {
 				return createReviewComponentAdapter();
 			}
 			@Override
-			public Adapter caseSubModelRoot(SubModelRoot object) {
-				return createSubModelRootAdapter();
+			public Adapter caseModelVersioning(IModelVersioning object) {
+				return createModelVersioningAdapter();
 			}
 			@Override
 			public Adapter defaultCase(EObject object) {
@@ -171,12 +172,12 @@ public class DRModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent <em>Review Component</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IReviewComponent <em>Review Component</em>}'.
 	 * <!-- begin-user-doc --> This default implementation returns null so that we can
 	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
 	 * end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent
+	 * @see org.eclipse.mylyn.reviews.core.model.IReviewComponent
 	 * @generated
 	 */
 	public Adapter createReviewComponentAdapter() {
@@ -184,16 +185,15 @@ public class DRModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot
-	 * <em>Sub Model Root</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
-	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
-	 * -->
-	 * 
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IModelVersioning <em>Model Versioning</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot
+	 * @see org.eclipse.mylyn.reviews.core.model.IModelVersioning
 	 * @generated
 	 */
-	public Adapter createSubModelRootAdapter() {
+	public Adapter createModelVersioningAdapter() {
 		return null;
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelResourceFactoryImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelResourceFactoryImpl.java
new file mode 100644
index 00000000..fbe1b089
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelResourceFactoryImpl.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2010, 2012 Ericsson
+ * 
+ * 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
+ * 
+ * Description:
+ * 
+ * Contributors:
+ * Alvaro Sanchez-Leon  - Initial API and implementation
+ * 
+ */
+package org.eclipse.mylyn.reviews.r4e.core.model.drules.util;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+/**
+ * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!-- end-user-doc -->
+ * @see org.eclipse.mylyn.reviews.r4e.core.model.drules.util.DRModelResourceImpl
+ * @generated
+ */
+public class DRModelResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DRModelResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		XMLResource result = new DRModelResourceImpl(uri);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
+		return result;
+	}
+
+} //DRModelResourceFactoryImpl
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelResourceImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelResourceImpl.java
new file mode 100644
index 00000000..143c0b51
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelResourceImpl.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2010, 2012 Ericsson
+ * 
+ * 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
+ * 
+ * Description:
+ * 
+ * Contributors:
+ * Alvaro Sanchez-Leon  - Initial API and implementation
+ * 
+ */
+package org.eclipse.mylyn.reviews.r4e.core.model.drules.util;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
+
+/**
+ * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->
+ * @see org.eclipse.mylyn.reviews.r4e.core.model.drules.util.DRModelResourceFactoryImpl
+ * @generated
+ */
+public class DRModelResourceImpl extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public DRModelResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} //DRModelResourceImpl
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelSwitch.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelSwitch.java
index 7c97534c..8118af33 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelSwitch.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelSwitch.java
@@ -9,21 +9,21 @@
  * Description:
  * 
  * Contributors:
- *    Alvaro Sanchez-Leon - Initial API and implementation
+ * Alvaro Sanchez-Leon  - Initial API and implementation
  * 
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.drules.util;
 
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-import org.eclipse.mylyn.reviews.r4e.core.model.drules.*;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleCollection;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
@@ -77,7 +77,7 @@ public class DRModelSwitch<T> extends Switch<T> {
 				R4EDesignRuleCollection r4EDesignRuleCollection = (R4EDesignRuleCollection)theEObject;
 				T result = caseR4EDesignRuleCollection(r4EDesignRuleCollection);
 				if (result == null) result = caseReviewComponent(r4EDesignRuleCollection);
-				if (result == null) result = caseSubModelRoot(r4EDesignRuleCollection);
+				if (result == null) result = caseModelVersioning(r4EDesignRuleCollection);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -177,22 +177,22 @@ public class DRModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReviewComponent(ReviewComponent object) {
+	public T caseReviewComponent(IReviewComponent object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sub Model Root</em>'. <!-- begin-user-doc
+	 * Returns the result of interpreting the object as an instance of '<em>Model Versioning</em>'. <!-- begin-user-doc
 	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param object
 	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sub Model Root</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Model Versioning</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseSubModelRoot(SubModelRoot object) {
+	public T caseModelVersioning(IModelVersioning object) {
 		return null;
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelXMLProcessor.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelXMLProcessor.java
new file mode 100644
index 00000000..ecc2141a
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/drules/util/DRModelXMLProcessor.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2010, 2012 Ericsson
+ * 
+ * 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
+ * 
+ * Description:
+ * 
+ * Contributors:
+ * Alvaro Sanchez-Leon  - Initial API and implementation
+ * 
+ */
+package org.eclipse.mylyn.reviews.r4e.core.model.drules.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * @generated
+ */
+public class DRModelXMLProcessor extends XMLProcessor {
+
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DRModelXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		DRModelPackage.eINSTANCE.eClass();
+	}
+
+	/**
+	 * Register for "*" and "xml" file extensions the DRModelResourceFactoryImpl factory.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected Map<String, Resource.Factory> getRegistrations() {
+		if (registrations == null) {
+			super.getRegistrations();
+			registrations.put(XML_EXTENSION, new DRModelResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new DRModelResourceFactoryImpl());
+		}
+		return registrations;
+	}
+
+} //DRModelXMLProcessor
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapDateToDurationImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapDateToDurationImpl.java
index 40fd76ae..e15136ae 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapDateToDurationImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapDateToDurationImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -17,16 +17,12 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 import java.util.Date;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.common.util.EMap;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapIDToComponentImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapIDToComponentImpl.java
index 6e344485..dd87fb05 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapIDToComponentImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapIDToComponentImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,17 +15,13 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.common.util.EMap;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EID;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapKeyToInfoAttributesImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapKeyToInfoAttributesImpl.java
index 53bf417a..e47d9cd7 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapKeyToInfoAttributesImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapKeyToInfoAttributesImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,16 +15,12 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.common.util.EMap;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapToUsersImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapToUsersImpl.java
index 5a06cea6..185018a3 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapToUsersImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapToUsersImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,17 +15,13 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.common.util.EMap;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUser;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapUserIDToUserReviewsImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapUserIDToUserReviewsImpl.java
index da151e17..f87cdc37 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapUserIDToUserReviewsImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/MapUserIDToUserReviewsImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,17 +15,13 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.BasicEMap;
 import org.eclipse.emf.common.util.EMap;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUserReviews;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyImpl.java
index 48a78167..146c9eb2 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -16,6 +16,8 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -28,7 +30,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.TopicImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.Topic;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
@@ -46,7 +48,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleRank;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl#getAssignedTo <em>Assigned To</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl#getR4eId <em>R4e Id</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl#getCreatedOn <em>Created On</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl#getAnomaly <em>Anomaly</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EAnomalyImpl#getInfoAtt <em>Info Att</em>}</li>
@@ -66,7 +68,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleRank;
  *
  * @generated
  */
-public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
+public class R4EAnomalyImpl extends Topic implements R4EAnomaly {
 	/**
 	 * The cached value of the '{@link #getAssignedTo() <em>Assigned To</em>}' attribute list.
 	 * <!-- begin-user-doc -->
@@ -78,14 +80,14 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 	protected EList<String> assignedTo;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' containment reference.
+	 * The cached value of the '{@link #getR4eId() <em>R4e Id</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @see #getId()
+	 * @see #getR4eId()
 	 * @generated
 	 * @ordered
 	 */
-	protected R4EID id;
+	protected R4EID r4eId;
 
 	/**
 	 * The default value of the '{@link #getCreatedOn() <em>Created On</em>}' attribute.
@@ -135,7 +137,7 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EAnomalyState STATE_EDEFAULT = R4EAnomalyState.R4E_ANOMALY_STATE_CREATED;
+	protected static final R4EAnomalyState STATE_EDEFAULT = R4EAnomalyState.CREATED;
 
 	/**
 	 * The cached value of the '{@link #getState() <em>State</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -175,7 +177,7 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EDesignRuleRank RANK_EDEFAULT = R4EDesignRuleRank.R4E_RANK_NONE;
+	protected static final R4EDesignRuleRank RANK_EDEFAULT = R4EDesignRuleRank.NONE;
 
 	/**
 	 * The cached value of the '{@link #getRank() <em>Rank</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -348,7 +350,7 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAssignedTo() {
+	public List<String> getAssignedTo() {
 		if (assignedTo == null) {
 			assignedTo = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_ANOMALY__ASSIGNED_TO);
 		}
@@ -359,6 +361,68 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	public R4EID getR4eId() {
+		if (r4eId != null && r4eId.eIsProxy()) {
+			InternalEObject oldR4eId = (InternalEObject)r4eId;
+			r4eId = (R4EID)eResolveProxy(oldR4eId);
+			if (r4eId != oldR4eId) {
+				InternalEObject newR4eId = (InternalEObject)r4eId;
+				NotificationChain msgs = oldR4eId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_ANOMALY__R4E_ID, null, null);
+				if (newR4eId.eInternalContainer() == null) {
+					msgs = newR4eId.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_ANOMALY__R4E_ID, null, msgs);
+				}
+				if (msgs != null) msgs.dispatch();
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_ANOMALY__R4E_ID, oldR4eId, r4eId));
+			}
+		}
+		return r4eId;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public R4EID basicGetR4eId() {
+		return r4eId;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetR4eId(R4EID newR4eId, NotificationChain msgs) {
+		R4EID oldR4eId = r4eId;
+		r4eId = newR4eId;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_ANOMALY__R4E_ID, oldR4eId, newR4eId);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setR4eId(R4EID newR4eId) {
+		if (newR4eId != r4eId) {
+			NotificationChain msgs = null;
+			if (r4eId != null)
+				msgs = ((InternalEObject)r4eId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_ANOMALY__R4E_ID, null, msgs);
+			if (newR4eId != null)
+				msgs = ((InternalEObject)newR4eId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_ANOMALY__R4E_ID, null, msgs);
+			msgs = basicSetR4eId(newR4eId, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_ANOMALY__R4E_ID, newR4eId, newR4eId));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
 	public Date getCreatedOn() {
 		return createdOn;
 	}
@@ -413,11 +477,11 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, String> getInfoAtt() {
+	public Map<String, String> getInfoAtt() {
 		if (infoAtt == null) {
 			infoAtt = new EcoreEMap<String,String>(RModelPackage.Literals.MAP_KEY_TO_INFO_ATTRIBUTES, MapKeyToInfoAttributesImpl.class, this, RModelPackage.R4E_ANOMALY__INFO_ATT);
 		}
-		return infoAtt;
+		return infoAtt.map();
 	}
 
 	/**
@@ -665,75 +729,13 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public R4EID getId() {
-		if (id != null && id.eIsProxy()) {
-			InternalEObject oldId = (InternalEObject)id;
-			id = (R4EID)eResolveProxy(oldId);
-			if (id != oldId) {
-				InternalEObject newId = (InternalEObject)id;
-				NotificationChain msgs = oldId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_ANOMALY__ID, null, null);
-				if (newId.eInternalContainer() == null) {
-					msgs = newId.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_ANOMALY__ID, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_ANOMALY__ID, oldId, id));
-			}
-		}
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public R4EID basicGetId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetId(R4EID newId, NotificationChain msgs) {
-		R4EID oldId = id;
-		id = newId;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_ANOMALY__ID, oldId, newId);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(R4EID newId) {
-		if (newId != id) {
-			NotificationChain msgs = null;
-			if (id != null)
-				msgs = ((InternalEObject)id).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_ANOMALY__ID, null, msgs);
-			if (newId != null)
-				msgs = ((InternalEObject)newId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_ANOMALY__ID, null, msgs);
-			msgs = basicSetId(newId, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_ANOMALY__ID, newId, newId));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case RModelPackage.R4E_ANOMALY__ID:
-				return basicSetId(null, msgs);
+			case RModelPackage.R4E_ANOMALY__R4E_ID:
+				return basicSetR4eId(null, msgs);
 			case RModelPackage.R4E_ANOMALY__INFO_ATT:
-				return ((InternalEList<?>)getInfoAtt()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -747,17 +749,17 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 		switch (featureID) {
 			case RModelPackage.R4E_ANOMALY__ASSIGNED_TO:
 				return getAssignedTo();
-			case RModelPackage.R4E_ANOMALY__ID:
-				if (resolve) return getId();
-				return basicGetId();
+			case RModelPackage.R4E_ANOMALY__R4E_ID:
+				if (resolve) return getR4eId();
+				return basicGetR4eId();
 			case RModelPackage.R4E_ANOMALY__CREATED_ON:
 				return getCreatedOn();
 			case RModelPackage.R4E_ANOMALY__ANOMALY:
 				if (resolve) return getAnomaly();
 				return basicGetAnomaly();
 			case RModelPackage.R4E_ANOMALY__INFO_ATT:
-				if (coreType) return getInfoAtt();
-				else return getInfoAtt().map();
+				if (coreType) return ((EMap.InternalMapView<String, String>)getInfoAtt()).eMap();
+				else return getInfoAtt();
 			case RModelPackage.R4E_ANOMALY__STATE:
 				return getState();
 			case RModelPackage.R4E_ANOMALY__DUE_DATE:
@@ -798,8 +800,8 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 				getAssignedTo().clear();
 				getAssignedTo().addAll((Collection<? extends String>)newValue);
 				return;
-			case RModelPackage.R4E_ANOMALY__ID:
-				setId((R4EID)newValue);
+			case RModelPackage.R4E_ANOMALY__R4E_ID:
+				setR4eId((R4EID)newValue);
 				return;
 			case RModelPackage.R4E_ANOMALY__CREATED_ON:
 				setCreatedOn((Date)newValue);
@@ -808,7 +810,7 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 				setAnomaly((R4EAnomaly)newValue);
 				return;
 			case RModelPackage.R4E_ANOMALY__INFO_ATT:
-				((EStructuralFeature.Setting)getInfoAtt()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).set(newValue);
 				return;
 			case RModelPackage.R4E_ANOMALY__STATE:
 				setState((R4EAnomalyState)newValue);
@@ -857,8 +859,8 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 			case RModelPackage.R4E_ANOMALY__ASSIGNED_TO:
 				getAssignedTo().clear();
 				return;
-			case RModelPackage.R4E_ANOMALY__ID:
-				setId((R4EID)null);
+			case RModelPackage.R4E_ANOMALY__R4E_ID:
+				setR4eId((R4EID)null);
 				return;
 			case RModelPackage.R4E_ANOMALY__CREATED_ON:
 				setCreatedOn(CREATED_ON_EDEFAULT);
@@ -915,8 +917,8 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 		switch (featureID) {
 			case RModelPackage.R4E_ANOMALY__ASSIGNED_TO:
 				return assignedTo != null && !assignedTo.isEmpty();
-			case RModelPackage.R4E_ANOMALY__ID:
-				return id != null;
+			case RModelPackage.R4E_ANOMALY__R4E_ID:
+				return r4eId != null;
 			case RModelPackage.R4E_ANOMALY__CREATED_ON:
 				return CREATED_ON_EDEFAULT == null ? createdOn != null : !CREATED_ON_EDEFAULT.equals(createdOn);
 			case RModelPackage.R4E_ANOMALY__ANOMALY:
@@ -963,7 +965,7 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 		}
 		if (baseClass == R4EIDComponent.class) {
 			switch (derivedFeatureID) {
-				case RModelPackage.R4E_ANOMALY__ID: return RModelPackage.R4EID_COMPONENT__ID;
+				case RModelPackage.R4E_ANOMALY__R4E_ID: return RModelPackage.R4EID_COMPONENT__R4E_ID;
 				default: return -1;
 			}
 		}
@@ -992,7 +994,7 @@ public class R4EAnomalyImpl extends TopicImpl implements R4EAnomaly {
 		}
 		if (baseClass == R4EIDComponent.class) {
 			switch (baseFeatureID) {
-				case RModelPackage.R4EID_COMPONENT__ID: return RModelPackage.R4E_ANOMALY__ID;
+				case RModelPackage.R4EID_COMPONENT__R4E_ID: return RModelPackage.R4E_ANOMALY__R4E_ID;
 				default: return -1;
 			}
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyTextPositionImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyTextPositionImpl.java
index 1894d082..bc4acae0 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyTextPositionImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyTextPositionImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -16,12 +16,9 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileVersion;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyTypeImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyTypeImpl.java
index 86cd9c6a..ce9e77f7 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyTypeImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EAnomalyTypeImpl.java
@@ -1,7 +1,6 @@
 /**
-/**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -18,7 +17,7 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.CommentTypeImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.CommentType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyType;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
@@ -34,7 +33,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  * 
  * @generated
  */
-public class R4EAnomalyTypeImpl extends CommentTypeImpl implements R4EAnomalyType {
+public class R4EAnomalyTypeImpl extends CommentType implements R4EAnomalyType {
 	/**
 	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ECommentImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ECommentImpl.java
index c2a228cd..b6b7dc65 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ECommentImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ECommentImpl.java
@@ -1,7 +1,6 @@
 /**
-/**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -17,6 +16,8 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -29,7 +30,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.CommentImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.Comment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EID;
@@ -43,7 +44,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl#getAssignedTo <em>Assigned To</em>}</li>
- *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl#getR4eId <em>R4e Id</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl#getCreatedOn <em>Created On</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl#getAnomaly <em>Anomaly</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4ECommentImpl#getInfoAtt <em>Info Att</em>}</li>
@@ -52,7 +53,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  *
  * @generated
  */
-public class R4ECommentImpl extends CommentImpl implements R4EComment {
+public class R4ECommentImpl extends Comment implements R4EComment {
 	/**
 	 * The cached value of the '{@link #getAssignedTo() <em>Assigned To</em>}' attribute list.
 	 * <!-- begin-user-doc -->
@@ -64,14 +65,14 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 	protected EList<String> assignedTo;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' containment reference.
+	 * The cached value of the '{@link #getR4eId() <em>R4e Id</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @see #getId()
+	 * @see #getR4eId()
 	 * @generated
 	 * @ordered
 	 */
-	protected R4EID id;
+	protected R4EID r4eId;
 
 	/**
 	 * The default value of the '{@link #getCreatedOn() <em>Created On</em>}' attribute.
@@ -134,7 +135,7 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAssignedTo() {
+	public List<String> getAssignedTo() {
 		if (assignedTo == null) {
 			assignedTo = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_COMMENT__ASSIGNED_TO);
 		}
@@ -145,127 +146,127 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Date getCreatedOn() {
-		return createdOn;
+	public R4EID getR4eId() {
+		if (r4eId != null && r4eId.eIsProxy()) {
+			InternalEObject oldR4eId = (InternalEObject)r4eId;
+			r4eId = (R4EID)eResolveProxy(oldR4eId);
+			if (r4eId != oldR4eId) {
+				InternalEObject newR4eId = (InternalEObject)r4eId;
+				NotificationChain msgs = oldR4eId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_COMMENT__R4E_ID, null, null);
+				if (newR4eId.eInternalContainer() == null) {
+					msgs = newR4eId.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_COMMENT__R4E_ID, null, msgs);
+				}
+				if (msgs != null) msgs.dispatch();
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_COMMENT__R4E_ID, oldR4eId, r4eId));
+			}
+		}
+		return r4eId;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setCreatedOn(Date newCreatedOn) {
-		Date oldCreatedOn = createdOn;
-		createdOn = newCreatedOn;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_COMMENT__CREATED_ON, oldCreatedOn, createdOn));
+	public R4EID basicGetR4eId() {
+		return r4eId;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public R4EAnomaly getAnomaly() {
-		if (anomaly != null && anomaly.eIsProxy()) {
-			InternalEObject oldAnomaly = (InternalEObject)anomaly;
-			anomaly = (R4EAnomaly)eResolveProxy(oldAnomaly);
-			if (anomaly != oldAnomaly) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_COMMENT__ANOMALY, oldAnomaly, anomaly));
-			}
+	public NotificationChain basicSetR4eId(R4EID newR4eId, NotificationChain msgs) {
+		R4EID oldR4eId = r4eId;
+		r4eId = newR4eId;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_COMMENT__R4E_ID, oldR4eId, newR4eId);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
-		return anomaly;
+		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public R4EAnomaly basicGetAnomaly() {
-		return anomaly;
+	public void setR4eId(R4EID newR4eId) {
+		if (newR4eId != r4eId) {
+			NotificationChain msgs = null;
+			if (r4eId != null)
+				msgs = ((InternalEObject)r4eId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_COMMENT__R4E_ID, null, msgs);
+			if (newR4eId != null)
+				msgs = ((InternalEObject)newR4eId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_COMMENT__R4E_ID, null, msgs);
+			msgs = basicSetR4eId(newR4eId, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_COMMENT__R4E_ID, newR4eId, newR4eId));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAnomaly(R4EAnomaly newAnomaly) {
-		R4EAnomaly oldAnomaly = anomaly;
-		anomaly = newAnomaly;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_COMMENT__ANOMALY, oldAnomaly, anomaly));
+	public Date getCreatedOn() {
+		return createdOn;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, String> getInfoAtt() {
-		if (infoAtt == null) {
-			infoAtt = new EcoreEMap<String,String>(RModelPackage.Literals.MAP_KEY_TO_INFO_ATTRIBUTES, MapKeyToInfoAttributesImpl.class, this, RModelPackage.R4E_COMMENT__INFO_ATT);
-		}
-		return infoAtt;
+	public void setCreatedOn(Date newCreatedOn) {
+		Date oldCreatedOn = createdOn;
+		createdOn = newCreatedOn;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_COMMENT__CREATED_ON, oldCreatedOn, createdOn));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public R4EID getId() {
-		if (id != null && id.eIsProxy()) {
-			InternalEObject oldId = (InternalEObject)id;
-			id = (R4EID)eResolveProxy(oldId);
-			if (id != oldId) {
-				InternalEObject newId = (InternalEObject)id;
-				NotificationChain msgs = oldId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_COMMENT__ID, null, null);
-				if (newId.eInternalContainer() == null) {
-					msgs = newId.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_COMMENT__ID, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
+	public R4EAnomaly getAnomaly() {
+		if (anomaly != null && anomaly.eIsProxy()) {
+			InternalEObject oldAnomaly = (InternalEObject)anomaly;
+			anomaly = (R4EAnomaly)eResolveProxy(oldAnomaly);
+			if (anomaly != oldAnomaly) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_COMMENT__ID, oldId, id));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_COMMENT__ANOMALY, oldAnomaly, anomaly));
 			}
 		}
-		return id;
+		return anomaly;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public R4EID basicGetId() {
-		return id;
+	public R4EAnomaly basicGetAnomaly() {
+		return anomaly;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetId(R4EID newId, NotificationChain msgs) {
-		R4EID oldId = id;
-		id = newId;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_COMMENT__ID, oldId, newId);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
+	public void setAnomaly(R4EAnomaly newAnomaly) {
+		R4EAnomaly oldAnomaly = anomaly;
+		anomaly = newAnomaly;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_COMMENT__ANOMALY, oldAnomaly, anomaly));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setId(R4EID newId) {
-		if (newId != id) {
-			NotificationChain msgs = null;
-			if (id != null)
-				msgs = ((InternalEObject)id).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_COMMENT__ID, null, msgs);
-			if (newId != null)
-				msgs = ((InternalEObject)newId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4E_COMMENT__ID, null, msgs);
-			msgs = basicSetId(newId, msgs);
-			if (msgs != null) msgs.dispatch();
+	public Map<String, String> getInfoAtt() {
+		if (infoAtt == null) {
+			infoAtt = new EcoreEMap<String,String>(RModelPackage.Literals.MAP_KEY_TO_INFO_ATTRIBUTES, MapKeyToInfoAttributesImpl.class, this, RModelPackage.R4E_COMMENT__INFO_ATT);
 		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_COMMENT__ID, newId, newId));
+		return infoAtt.map();
 	}
 
 	/**
@@ -275,10 +276,10 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case RModelPackage.R4E_COMMENT__ID:
-				return basicSetId(null, msgs);
+			case RModelPackage.R4E_COMMENT__R4E_ID:
+				return basicSetR4eId(null, msgs);
 			case RModelPackage.R4E_COMMENT__INFO_ATT:
-				return ((InternalEList<?>)getInfoAtt()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -292,17 +293,17 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 		switch (featureID) {
 			case RModelPackage.R4E_COMMENT__ASSIGNED_TO:
 				return getAssignedTo();
-			case RModelPackage.R4E_COMMENT__ID:
-				if (resolve) return getId();
-				return basicGetId();
+			case RModelPackage.R4E_COMMENT__R4E_ID:
+				if (resolve) return getR4eId();
+				return basicGetR4eId();
 			case RModelPackage.R4E_COMMENT__CREATED_ON:
 				return getCreatedOn();
 			case RModelPackage.R4E_COMMENT__ANOMALY:
 				if (resolve) return getAnomaly();
 				return basicGetAnomaly();
 			case RModelPackage.R4E_COMMENT__INFO_ATT:
-				if (coreType) return getInfoAtt();
-				else return getInfoAtt().map();
+				if (coreType) return ((EMap.InternalMapView<String, String>)getInfoAtt()).eMap();
+				else return getInfoAtt();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -319,8 +320,8 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 				getAssignedTo().clear();
 				getAssignedTo().addAll((Collection<? extends String>)newValue);
 				return;
-			case RModelPackage.R4E_COMMENT__ID:
-				setId((R4EID)newValue);
+			case RModelPackage.R4E_COMMENT__R4E_ID:
+				setR4eId((R4EID)newValue);
 				return;
 			case RModelPackage.R4E_COMMENT__CREATED_ON:
 				setCreatedOn((Date)newValue);
@@ -329,7 +330,7 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 				setAnomaly((R4EAnomaly)newValue);
 				return;
 			case RModelPackage.R4E_COMMENT__INFO_ATT:
-				((EStructuralFeature.Setting)getInfoAtt()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).set(newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -345,8 +346,8 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 			case RModelPackage.R4E_COMMENT__ASSIGNED_TO:
 				getAssignedTo().clear();
 				return;
-			case RModelPackage.R4E_COMMENT__ID:
-				setId((R4EID)null);
+			case RModelPackage.R4E_COMMENT__R4E_ID:
+				setR4eId((R4EID)null);
 				return;
 			case RModelPackage.R4E_COMMENT__CREATED_ON:
 				setCreatedOn(CREATED_ON_EDEFAULT);
@@ -370,8 +371,8 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 		switch (featureID) {
 			case RModelPackage.R4E_COMMENT__ASSIGNED_TO:
 				return assignedTo != null && !assignedTo.isEmpty();
-			case RModelPackage.R4E_COMMENT__ID:
-				return id != null;
+			case RModelPackage.R4E_COMMENT__R4E_ID:
+				return r4eId != null;
 			case RModelPackage.R4E_COMMENT__CREATED_ON:
 				return CREATED_ON_EDEFAULT == null ? createdOn != null : !CREATED_ON_EDEFAULT.equals(createdOn);
 			case RModelPackage.R4E_COMMENT__ANOMALY:
@@ -396,7 +397,7 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 		}
 		if (baseClass == R4EIDComponent.class) {
 			switch (derivedFeatureID) {
-				case RModelPackage.R4E_COMMENT__ID: return RModelPackage.R4EID_COMPONENT__ID;
+				case RModelPackage.R4E_COMMENT__R4E_ID: return RModelPackage.R4EID_COMPONENT__R4E_ID;
 				default: return -1;
 			}
 		}
@@ -417,7 +418,7 @@ public class R4ECommentImpl extends CommentImpl implements R4EComment {
 		}
 		if (baseClass == R4EIDComponent.class) {
 			switch (baseFeatureID) {
-				case RModelPackage.R4EID_COMPONENT__ID: return RModelPackage.R4E_COMMENT__ID;
+				case RModelPackage.R4EID_COMPONENT__R4E_ID: return RModelPackage.R4E_COMMENT__R4E_ID;
 				default: return -1;
 			}
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ECommentTypeImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ECommentTypeImpl.java
index 738baeac..f2afde97 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ECommentTypeImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ECommentTypeImpl.java
@@ -1,7 +1,6 @@
 /**
-/**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -18,7 +17,7 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.CommentTypeImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.CommentType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ECommentType;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleClass;
@@ -35,7 +34,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleClass;
  * 
  * @generated
  */
-public class R4ECommentTypeImpl extends CommentTypeImpl implements R4ECommentType {
+public class R4ECommentTypeImpl extends CommentType implements R4ECommentType {
 	/**
 	 * The default value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
@@ -44,7 +43,7 @@ public class R4ECommentTypeImpl extends CommentTypeImpl implements R4ECommentTyp
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EDesignRuleClass TYPE_EDEFAULT = R4EDesignRuleClass.R4E_CLASS_ERRONEOUS;
+	protected static final R4EDesignRuleClass TYPE_EDEFAULT = R4EDesignRuleClass.ERRONEOUS;
 
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EContentImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EContentImpl.java
index 7c0fd9db..81a7c765 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EContentImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EContentImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.LocationImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.Location;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EContent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
@@ -36,7 +36,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  *
  * @generated
  */
-public abstract class R4EContentImpl extends LocationImpl implements R4EContent {
+public abstract class R4EContentImpl extends Location implements R4EContent {
 	/**
 	 * The cached value of the '{@link #getLocation() <em>Location</em>}' containment reference.
 	 * <!-- begin-user-doc -->
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFileContextImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFileContextImpl.java
index bc8364f2..2db4da20 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFileContextImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFileContextImpl.java
@@ -16,6 +16,8 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -89,7 +91,7 @@ public class R4EFileContextImpl extends R4EIDComponentImpl implements R4EFileCon
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EContextType TYPE_EDEFAULT = R4EContextType.R4E_UNDEFINED;
+	protected static final R4EContextType TYPE_EDEFAULT = R4EContextType.UNDEFINED;
 
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -132,7 +134,7 @@ public class R4EFileContextImpl extends R4EIDComponentImpl implements R4EFileCon
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EDelta> getDeltas() {
+	public List<R4EDelta> getDeltas() {
 		if (deltas == null) {
 			deltas = new EObjectContainmentEList.Resolving<R4EDelta>(R4EDelta.class, this, RModelPackage.R4E_FILE_CONTEXT__DELTAS);
 		}
@@ -286,11 +288,11 @@ public class R4EFileContextImpl extends R4EIDComponentImpl implements R4EFileCon
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, String> getInfoAtt() {
+	public Map<String, String> getInfoAtt() {
 		if (infoAtt == null) {
 			infoAtt = new EcoreEMap<String,String>(RModelPackage.Literals.MAP_KEY_TO_INFO_ATTRIBUTES, MapKeyToInfoAttributesImpl.class, this, RModelPackage.R4E_FILE_CONTEXT__INFO_ATT);
 		}
-		return infoAtt;
+		return infoAtt.map();
 	}
 
 	/**
@@ -307,7 +309,7 @@ public class R4EFileContextImpl extends R4EIDComponentImpl implements R4EFileCon
 			case RModelPackage.R4E_FILE_CONTEXT__TARGET:
 				return basicSetTarget(null, msgs);
 			case RModelPackage.R4E_FILE_CONTEXT__INFO_ATT:
-				return ((InternalEList<?>)getInfoAtt()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -330,8 +332,8 @@ public class R4EFileContextImpl extends R4EIDComponentImpl implements R4EFileCon
 			case RModelPackage.R4E_FILE_CONTEXT__TYPE:
 				return getType();
 			case RModelPackage.R4E_FILE_CONTEXT__INFO_ATT:
-				if (coreType) return getInfoAtt();
-				else return getInfoAtt().map();
+				if (coreType) return ((EMap.InternalMapView<String, String>)getInfoAtt()).eMap();
+				else return getInfoAtt();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -358,7 +360,7 @@ public class R4EFileContextImpl extends R4EIDComponentImpl implements R4EFileCon
 				setType((R4EContextType)newValue);
 				return;
 			case RModelPackage.R4E_FILE_CONTEXT__INFO_ATT:
-				((EStructuralFeature.Setting)getInfoAtt()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).set(newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFileVersionImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFileVersionImpl.java
index 4c769825..ec9c7c9f 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFileVersionImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFileVersionImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -14,25 +14,22 @@
  */
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
-import org.eclipse.core.resources.IResource;
+import java.util.Map;
 
+import org.eclipse.core.resources.IResource;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EMap;
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileVersion;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelFactory;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
-
 import org.eclipse.team.core.history.IFileRevision;
 
 /**
@@ -361,11 +358,11 @@ public class R4EFileVersionImpl extends EObjectImpl implements R4EFileVersion {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, String> getInfoAtt() {
+	public Map<String, String> getInfoAtt() {
 		if (infoAtt == null) {
 			infoAtt = new EcoreEMap<String,String>(RModelPackage.Literals.MAP_KEY_TO_INFO_ATTRIBUTES, MapKeyToInfoAttributesImpl.class, this, RModelPackage.R4E_FILE_VERSION__INFO_ATT);
 		}
-		return infoAtt;
+		return infoAtt.map();
 	}
 
 	/**
@@ -376,7 +373,7 @@ public class R4EFileVersionImpl extends EObjectImpl implements R4EFileVersion {
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case RModelPackage.R4E_FILE_VERSION__INFO_ATT:
-				return ((InternalEList<?>)getInfoAtt()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -403,8 +400,8 @@ public class R4EFileVersionImpl extends EObjectImpl implements R4EFileVersion {
 			case RModelPackage.R4E_FILE_VERSION__FILE_REVISION:
 				return getFileRevision();
 			case RModelPackage.R4E_FILE_VERSION__INFO_ATT:
-				if (coreType) return getInfoAtt();
-				else return getInfoAtt().map();
+				if (coreType) return ((EMap.InternalMapView<String, String>)getInfoAtt()).eMap();
+				else return getInfoAtt();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -438,7 +435,7 @@ public class R4EFileVersionImpl extends EObjectImpl implements R4EFileVersion {
 				setFileRevision((IFileRevision)newValue);
 				return;
 			case RModelPackage.R4E_FILE_VERSION__INFO_ATT:
-				((EStructuralFeature.Setting)getInfoAtt()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).set(newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFormalReviewImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFormalReviewImpl.java
index 03368b96..a6f4e4a0 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFormalReviewImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EFormalReviewImpl.java
@@ -16,6 +16,7 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -131,7 +132,7 @@ public class R4EFormalReviewImpl extends R4EReviewImpl implements R4EFormalRevie
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EReviewPhaseInfo> getPhases() {
+	public List<R4EReviewPhaseInfo> getPhases() {
 		if (phases == null) {
 			phases = new EObjectContainmentEList.Resolving<R4EReviewPhaseInfo>(R4EReviewPhaseInfo.class, this, RModelPackage.R4E_FORMAL_REVIEW__PHASES);
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EIDComponentImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EIDComponentImpl.java
index 7b84c60d..d420fa96 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EIDComponentImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EIDComponentImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -16,12 +16,9 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EID;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
@@ -32,7 +29,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EIDComponentImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EIDComponentImpl#getR4eId <em>R4e Id</em>}</li>
  * </ul>
  * </p>
  * 
@@ -40,14 +37,14 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  */
 public class R4EIDComponentImpl extends R4EReviewComponentImpl implements R4EIDComponent {
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' containment reference.
+	 * The cached value of the '{@link #getR4eId() <em>R4e Id</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @see #getId()
+	 * @see #getR4eId()
 	 * @generated
 	 * @ordered
 	 */
-	protected R4EID id;
+	protected R4EID r4eId;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -70,41 +67,41 @@ public class R4EIDComponentImpl extends R4EReviewComponentImpl implements R4EIDC
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public R4EID getId() {
-		if (id != null && id.eIsProxy()) {
-			InternalEObject oldId = (InternalEObject)id;
-			id = (R4EID)eResolveProxy(oldId);
-			if (id != oldId) {
-				InternalEObject newId = (InternalEObject)id;
-				NotificationChain msgs = oldId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4EID_COMPONENT__ID, null, null);
-				if (newId.eInternalContainer() == null) {
-					msgs = newId.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4EID_COMPONENT__ID, null, msgs);
+	public R4EID getR4eId() {
+		if (r4eId != null && r4eId.eIsProxy()) {
+			InternalEObject oldR4eId = (InternalEObject)r4eId;
+			r4eId = (R4EID)eResolveProxy(oldR4eId);
+			if (r4eId != oldR4eId) {
+				InternalEObject newR4eId = (InternalEObject)r4eId;
+				NotificationChain msgs = oldR4eId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4EID_COMPONENT__R4E_ID, null, null);
+				if (newR4eId.eInternalContainer() == null) {
+					msgs = newR4eId.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4EID_COMPONENT__R4E_ID, null, msgs);
 				}
 				if (msgs != null) msgs.dispatch();
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4EID_COMPONENT__ID, oldId, id));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4EID_COMPONENT__R4E_ID, oldR4eId, r4eId));
 			}
 		}
-		return id;
+		return r4eId;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public R4EID basicGetId() {
-		return id;
+	public R4EID basicGetR4eId() {
+		return r4eId;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetId(R4EID newId, NotificationChain msgs) {
-		R4EID oldId = id;
-		id = newId;
+	public NotificationChain basicSetR4eId(R4EID newR4eId, NotificationChain msgs) {
+		R4EID oldR4eId = r4eId;
+		r4eId = newR4eId;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, RModelPackage.R4EID_COMPONENT__ID, oldId, newId);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, RModelPackage.R4EID_COMPONENT__R4E_ID, oldR4eId, newR4eId);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -114,18 +111,18 @@ public class R4EIDComponentImpl extends R4EReviewComponentImpl implements R4EIDC
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setId(R4EID newId) {
-		if (newId != id) {
+	public void setR4eId(R4EID newR4eId) {
+		if (newR4eId != r4eId) {
 			NotificationChain msgs = null;
-			if (id != null)
-				msgs = ((InternalEObject)id).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4EID_COMPONENT__ID, null, msgs);
-			if (newId != null)
-				msgs = ((InternalEObject)newId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4EID_COMPONENT__ID, null, msgs);
-			msgs = basicSetId(newId, msgs);
+			if (r4eId != null)
+				msgs = ((InternalEObject)r4eId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4EID_COMPONENT__R4E_ID, null, msgs);
+			if (newR4eId != null)
+				msgs = ((InternalEObject)newR4eId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RModelPackage.R4EID_COMPONENT__R4E_ID, null, msgs);
+			msgs = basicSetR4eId(newR4eId, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4EID_COMPONENT__ID, newId, newId));
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4EID_COMPONENT__R4E_ID, newR4eId, newR4eId));
 	}
 
 	/**
@@ -135,8 +132,8 @@ public class R4EIDComponentImpl extends R4EReviewComponentImpl implements R4EIDC
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case RModelPackage.R4EID_COMPONENT__ID:
-				return basicSetId(null, msgs);
+			case RModelPackage.R4EID_COMPONENT__R4E_ID:
+				return basicSetR4eId(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -148,9 +145,9 @@ public class R4EIDComponentImpl extends R4EReviewComponentImpl implements R4EIDC
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case RModelPackage.R4EID_COMPONENT__ID:
-				if (resolve) return getId();
-				return basicGetId();
+			case RModelPackage.R4EID_COMPONENT__R4E_ID:
+				if (resolve) return getR4eId();
+				return basicGetR4eId();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -162,8 +159,8 @@ public class R4EIDComponentImpl extends R4EReviewComponentImpl implements R4EIDC
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case RModelPackage.R4EID_COMPONENT__ID:
-				setId((R4EID)newValue);
+			case RModelPackage.R4EID_COMPONENT__R4E_ID:
+				setR4eId((R4EID)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -176,8 +173,8 @@ public class R4EIDComponentImpl extends R4EReviewComponentImpl implements R4EIDC
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case RModelPackage.R4EID_COMPONENT__ID:
-				setId((R4EID)null);
+			case RModelPackage.R4EID_COMPONENT__R4E_ID:
+				setR4eId((R4EID)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -190,8 +187,8 @@ public class R4EIDComponentImpl extends R4EReviewComponentImpl implements R4EIDC
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case RModelPackage.R4EID_COMPONENT__ID:
-				return id != null;
+			case RModelPackage.R4EID_COMPONENT__R4E_ID:
+				return r4eId != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EItemImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EItemImpl.java
index 258613ba..d6874774 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EItemImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EItemImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,8 +15,10 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
-
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -27,12 +29,15 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
+import org.eclipse.mylyn.reviews.core.model.ILocation;
+import org.eclipse.mylyn.reviews.core.model.IReview;
+import org.eclipse.mylyn.reviews.core.model.IReviewItem;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
+import org.eclipse.mylyn.reviews.core.model.IUser;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileContext;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EItem;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
@@ -44,6 +49,9 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  * <ul>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl#getAddedBy <em>Added By</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl#getReview <em>Review</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl#getTopics <em>Topics</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl#getAddedById <em>Added By Id</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EItemImpl#getFileContextList <em>File Context List</em>}</li>
@@ -66,7 +74,7 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * @generated
 	 * @ordered
 	 */
-	protected User addedBy;
+	protected IUser addedBy;
 
 	/**
 	 * The cached value of the '{@link #getReview() <em>Review</em>}' reference.
@@ -76,7 +84,55 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * @generated
 	 * @ordered
 	 */
-	protected Review review;
+	protected IReview review;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getTopics() <em>Topics</em>}' reference list.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @see #getTopics()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ITopic> topics;
+
+	/**
+	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String id = ID_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
@@ -228,10 +284,10 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public User getAddedBy() {
+	public IUser getAddedBy() {
 		if (addedBy != null && addedBy.eIsProxy()) {
 			InternalEObject oldAddedBy = (InternalEObject)addedBy;
-			addedBy = (User)eResolveProxy(oldAddedBy);
+			addedBy = (IUser)eResolveProxy(oldAddedBy);
 			if (addedBy != oldAddedBy) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_ITEM__ADDED_BY, oldAddedBy, addedBy));
@@ -244,7 +300,7 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public User basicGetAddedBy() {
+	public IUser basicGetAddedBy() {
 		return addedBy;
 	}
 
@@ -252,8 +308,8 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAddedBy(User newAddedBy) {
-		User oldAddedBy = addedBy;
+	public void setAddedBy(IUser newAddedBy) {
+		IUser oldAddedBy = addedBy;
 		addedBy = newAddedBy;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_ITEM__ADDED_BY, oldAddedBy, addedBy));
@@ -263,10 +319,10 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Review getReview() {
+	public IReview getReview() {
 		if (review != null && review.eIsProxy()) {
 			InternalEObject oldReview = (InternalEObject)review;
-			review = (Review)eResolveProxy(oldReview);
+			review = (IReview)eResolveProxy(oldReview);
 			if (review != oldReview) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_ITEM__REVIEW, oldReview, review));
@@ -279,7 +335,7 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Review basicGetReview() {
+	public IReview basicGetReview() {
 		return review;
 	}
 
@@ -287,8 +343,8 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setReview(Review newReview) {
-		Review oldReview = review;
+	public void setReview(IReview newReview) {
+		IReview oldReview = review;
 		review = newReview;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_ITEM__REVIEW, oldReview, review));
@@ -298,6 +354,55 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_ITEM__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List<ITopic> getTopics() {
+		if (topics == null) {
+			topics = new EObjectWithInverseResolvingEList<ITopic>(ITopic.class, this, RModelPackage.R4E_ITEM__TOPICS, ReviewsPackage.TOPIC__ITEM);
+		}
+		return topics;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setId(String newId) {
+		String oldId = id;
+		id = newId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_ITEM__ID, oldId, id));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String getDescription() {
 		return description;
 	}
@@ -336,7 +441,7 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EFileContext> getFileContextList() {
+	public List<R4EFileContext> getFileContextList() {
 		if (fileContextList == null) {
 			fileContextList = new EObjectContainmentEList.Resolving<R4EFileContext>(R4EFileContext.class, this, RModelPackage.R4E_ITEM__FILE_CONTEXT_LIST);
 		}
@@ -366,7 +471,7 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getProjectURIs() {
+	public List<String> getProjectURIs() {
 		if (projectURIs == null) {
 			projectURIs = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_ITEM__PROJECT_UR_IS);
 		}
@@ -415,11 +520,35 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, String> getInfoAtt() {
+	public Map<String, String> getInfoAtt() {
 		if (infoAtt == null) {
 			infoAtt = new EcoreEMap<String,String>(RModelPackage.Literals.MAP_KEY_TO_INFO_ATTRIBUTES, MapKeyToInfoAttributesImpl.class, this, RModelPackage.R4E_ITEM__INFO_ATT);
 		}
-		return infoAtt;
+		return infoAtt.map();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ITopic createTopicComment(ILocation initalLocation, String commentText) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case RModelPackage.R4E_ITEM__TOPICS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getTopics()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
@@ -429,10 +558,12 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
+			case RModelPackage.R4E_ITEM__TOPICS:
+				return ((InternalEList<?>)getTopics()).basicRemove(otherEnd, msgs);
 			case RModelPackage.R4E_ITEM__FILE_CONTEXT_LIST:
 				return ((InternalEList<?>)getFileContextList()).basicRemove(otherEnd, msgs);
 			case RModelPackage.R4E_ITEM__INFO_ATT:
-				return ((InternalEList<?>)getInfoAtt()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -450,6 +581,12 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 			case RModelPackage.R4E_ITEM__REVIEW:
 				if (resolve) return getReview();
 				return basicGetReview();
+			case RModelPackage.R4E_ITEM__NAME:
+				return getName();
+			case RModelPackage.R4E_ITEM__TOPICS:
+				return getTopics();
+			case RModelPackage.R4E_ITEM__ID:
+				return getId();
 			case RModelPackage.R4E_ITEM__DESCRIPTION:
 				return getDescription();
 			case RModelPackage.R4E_ITEM__ADDED_BY_ID:
@@ -465,8 +602,8 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 			case RModelPackage.R4E_ITEM__SUBMITTED:
 				return getSubmitted();
 			case RModelPackage.R4E_ITEM__INFO_ATT:
-				if (coreType) return getInfoAtt();
-				else return getInfoAtt().map();
+				if (coreType) return ((EMap.InternalMapView<String, String>)getInfoAtt()).eMap();
+				else return getInfoAtt();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -480,10 +617,20 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case RModelPackage.R4E_ITEM__ADDED_BY:
-				setAddedBy((User)newValue);
+				setAddedBy((IUser)newValue);
 				return;
 			case RModelPackage.R4E_ITEM__REVIEW:
-				setReview((Review)newValue);
+				setReview((IReview)newValue);
+				return;
+			case RModelPackage.R4E_ITEM__NAME:
+				setName((String)newValue);
+				return;
+			case RModelPackage.R4E_ITEM__TOPICS:
+				getTopics().clear();
+				getTopics().addAll((Collection<? extends ITopic>)newValue);
+				return;
+			case RModelPackage.R4E_ITEM__ID:
+				setId((String)newValue);
 				return;
 			case RModelPackage.R4E_ITEM__DESCRIPTION:
 				setDescription((String)newValue);
@@ -509,7 +656,7 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 				setSubmitted((Date)newValue);
 				return;
 			case RModelPackage.R4E_ITEM__INFO_ATT:
-				((EStructuralFeature.Setting)getInfoAtt()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, String>)getInfoAtt()).eMap()).set(newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -523,10 +670,19 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	public void eUnset(int featureID) {
 		switch (featureID) {
 			case RModelPackage.R4E_ITEM__ADDED_BY:
-				setAddedBy((User)null);
+				setAddedBy((IUser)null);
 				return;
 			case RModelPackage.R4E_ITEM__REVIEW:
-				setReview((Review)null);
+				setReview((IReview)null);
+				return;
+			case RModelPackage.R4E_ITEM__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case RModelPackage.R4E_ITEM__TOPICS:
+				getTopics().clear();
+				return;
+			case RModelPackage.R4E_ITEM__ID:
+				setId(ID_EDEFAULT);
 				return;
 			case RModelPackage.R4E_ITEM__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
@@ -567,6 +723,12 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 				return addedBy != null;
 			case RModelPackage.R4E_ITEM__REVIEW:
 				return review != null;
+			case RModelPackage.R4E_ITEM__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case RModelPackage.R4E_ITEM__TOPICS:
+				return topics != null && !topics.isEmpty();
+			case RModelPackage.R4E_ITEM__ID:
+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
 			case RModelPackage.R4E_ITEM__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 			case RModelPackage.R4E_ITEM__ADDED_BY_ID:
@@ -593,10 +755,13 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Item.class) {
+		if (baseClass == IReviewItem.class) {
 			switch (derivedFeatureID) {
-				case RModelPackage.R4E_ITEM__ADDED_BY: return ModelPackage.ITEM__ADDED_BY;
-				case RModelPackage.R4E_ITEM__REVIEW: return ModelPackage.ITEM__REVIEW;
+				case RModelPackage.R4E_ITEM__ADDED_BY: return ReviewsPackage.REVIEW_ITEM__ADDED_BY;
+				case RModelPackage.R4E_ITEM__REVIEW: return ReviewsPackage.REVIEW_ITEM__REVIEW;
+				case RModelPackage.R4E_ITEM__NAME: return ReviewsPackage.REVIEW_ITEM__NAME;
+				case RModelPackage.R4E_ITEM__TOPICS: return ReviewsPackage.REVIEW_ITEM__TOPICS;
+				case RModelPackage.R4E_ITEM__ID: return ReviewsPackage.REVIEW_ITEM__ID;
 				default: return -1;
 			}
 		}
@@ -609,10 +774,13 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Item.class) {
+		if (baseClass == IReviewItem.class) {
 			switch (baseFeatureID) {
-				case ModelPackage.ITEM__ADDED_BY: return RModelPackage.R4E_ITEM__ADDED_BY;
-				case ModelPackage.ITEM__REVIEW: return RModelPackage.R4E_ITEM__REVIEW;
+				case ReviewsPackage.REVIEW_ITEM__ADDED_BY: return RModelPackage.R4E_ITEM__ADDED_BY;
+				case ReviewsPackage.REVIEW_ITEM__REVIEW: return RModelPackage.R4E_ITEM__REVIEW;
+				case ReviewsPackage.REVIEW_ITEM__NAME: return RModelPackage.R4E_ITEM__NAME;
+				case ReviewsPackage.REVIEW_ITEM__TOPICS: return RModelPackage.R4E_ITEM__TOPICS;
+				case ReviewsPackage.REVIEW_ITEM__ID: return RModelPackage.R4E_ITEM__ID;
 				default: return -1;
 			}
 		}
@@ -628,7 +796,11 @@ public class R4EItemImpl extends R4EIDComponentImpl implements R4EItem {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", id: ");
+		result.append(id);
+		result.append(", description: ");
 		result.append(description);
 		result.append(", addedById: ");
 		result.append(addedById);
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EMeetingDataImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EMeetingDataImpl.java
index 0ec0b9d0..d007b53f 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EMeetingDataImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EMeetingDataImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,14 +15,13 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
+import java.util.List;
 
+import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EMeetingData;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
@@ -370,7 +369,7 @@ public class R4EMeetingDataImpl extends EObjectImpl implements R4EMeetingData {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getReceivers() {
+	public List<String> getReceivers() {
 		if (receivers == null) {
 			receivers = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_MEETING_DATA__RECEIVERS);
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EParticipantImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EParticipantImpl.java
index a232394d..daa315a1 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EParticipantImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EParticipantImpl.java
@@ -1,7 +1,6 @@
 /**
-/**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -16,8 +15,10 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
-
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -145,7 +146,7 @@ public class R4EParticipantImpl extends R4EUserImpl implements R4EParticipant {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EUserRole> getRoles() {
+	public List<R4EUserRole> getRoles() {
 		if (roles == null) {
 			roles = new EDataTypeUniqueEList<R4EUserRole>(R4EUserRole.class, this, RModelPackage.R4E_PARTICIPANT__ROLES);
 		}
@@ -194,7 +195,7 @@ public class R4EParticipantImpl extends R4EUserImpl implements R4EParticipant {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EID> getReviewedContent() {
+	public List<R4EID> getReviewedContent() {
 		if (reviewedContent == null) {
 			reviewedContent = new EObjectResolvingEList<R4EID>(R4EID.class, this, RModelPackage.R4E_PARTICIPANT__REVIEWED_CONTENT);
 		}
@@ -205,11 +206,11 @@ public class R4EParticipantImpl extends R4EUserImpl implements R4EParticipant {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<Date, Integer> getTimeLog() {
+	public Map<Date, Integer> getTimeLog() {
 		if (timeLog == null) {
 			timeLog = new EcoreEMap<Date,Integer>(RModelPackage.Literals.MAP_DATE_TO_DURATION, MapDateToDurationImpl.class, this, RModelPackage.R4E_PARTICIPANT__TIME_LOG);
 		}
-		return timeLog;
+		return timeLog.map();
 	}
 
 	/**
@@ -220,7 +221,7 @@ public class R4EParticipantImpl extends R4EUserImpl implements R4EParticipant {
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case RModelPackage.R4E_PARTICIPANT__TIME_LOG:
-				return ((InternalEList<?>)getTimeLog()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<Date, Integer>)getTimeLog()).eMap()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -241,8 +242,8 @@ public class R4EParticipantImpl extends R4EUserImpl implements R4EParticipant {
 			case RModelPackage.R4E_PARTICIPANT__REVIEWED_CONTENT:
 				return getReviewedContent();
 			case RModelPackage.R4E_PARTICIPANT__TIME_LOG:
-				if (coreType) return getTimeLog();
-				else return getTimeLog().map();
+				if (coreType) return ((EMap.InternalMapView<Date, Integer>)getTimeLog()).eMap();
+				else return getTimeLog();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -270,7 +271,7 @@ public class R4EParticipantImpl extends R4EUserImpl implements R4EParticipant {
 				getReviewedContent().addAll((Collection<? extends R4EID>)newValue);
 				return;
 			case RModelPackage.R4E_PARTICIPANT__TIME_LOG:
-				((EStructuralFeature.Setting)getTimeLog()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<Date, Integer>)getTimeLog()).eMap()).set(newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewComponentImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewComponentImpl.java
index 1d04b425..7750fdd8 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewComponentImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewComponentImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,10 +15,12 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
+import java.util.List;
+
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewComponentImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
@@ -34,7 +36,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  *
  * @generated
  */
-public class R4EReviewComponentImpl extends ReviewComponentImpl implements R4EReviewComponent {
+public class R4EReviewComponentImpl extends ReviewComponent implements R4EReviewComponent {
 	/**
 	 * The cached value of the '{@link #getAssignedTo() <em>Assigned To</em>}' attribute list.
 	 * <!-- begin-user-doc -->
@@ -66,7 +68,7 @@ public class R4EReviewComponentImpl extends ReviewComponentImpl implements R4ERe
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAssignedTo() {
+	public List<String> getAssignedTo() {
 		if (assignedTo == null) {
 			assignedTo = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_REVIEW_COMPONENT__ASSIGNED_TO);
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewDecisionImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewDecisionImpl.java
index 5798627b..4114dbb3 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewDecisionImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewDecisionImpl.java
@@ -65,7 +65,7 @@ public class R4EReviewDecisionImpl extends EObjectImpl implements R4EReviewDecis
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EDecision VALUE_EDEFAULT = R4EDecision.R4E_REVIEW_DECISION_NONE;
+	protected static final R4EDecision VALUE_EDEFAULT = R4EDecision.NONE;
 
 	/**
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewGroupImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewGroupImpl.java
index 7fd43806..66a4f8aa 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewGroupImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewGroupImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,6 +15,8 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -28,16 +30,15 @@ import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewGroup;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUserReviews;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.Roots;
-import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>R4E Review Group</b></em>'. <!-- end-user-doc
@@ -46,6 +47,8 @@ import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
  * The following features are implemented:
  * <ul>
  * <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewGroupImpl#getAssignedTo <em>Assigned To</em>}</li>
+ * <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewGroupImpl#getFragmentVersion <em>Fragment Version
+ * </em>}</li>
  * <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewGroupImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewGroupImpl#getFolder <em>Folder</em>}</li>
  * <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewGroupImpl#getDefaultEntryCriteria <em>Default Entry
@@ -67,7 +70,7 @@ import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
  * 
  * @generated
  */
-public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGroup {
+public class R4EReviewGroupImpl extends ReviewGroup implements R4EReviewGroup {
 	/**
 	 * The cached value of the '{@link #getAssignedTo() <em>Assigned To</em>}' attribute list.
 	 * <!-- begin-user-doc -->
@@ -79,6 +82,26 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 	protected EList<String> assignedTo;
 
 	/**
+	 * The default value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @see #getFragmentVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FRAGMENT_VERSION_EDEFAULT = "1.0.0";
+
+	/**
+	 * The cached value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @see #getFragmentVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fragmentVersion = FRAGMENT_VERSION_EDEFAULT;
+
+	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -227,7 +250,7 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAssignedTo() {
+	public List<String> getAssignedTo() {
 		if (assignedTo == null) {
 			assignedTo = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_REVIEW_GROUP__ASSIGNED_TO);
 		}
@@ -238,6 +261,25 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getFragmentVersion() {
+		return fragmentVersion;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFragmentVersion(String newFragmentVersion) {
+		String oldFragmentVersion = fragmentVersion;
+		fragmentVersion = newFragmentVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_REVIEW_GROUP__FRAGMENT_VERSION, oldFragmentVersion, fragmentVersion));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String getName() {
 		return name;
 	}
@@ -295,7 +337,7 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAvailableProjects() {
+	public List<String> getAvailableProjects() {
 		if (availableProjects == null) {
 			availableProjects = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_REVIEW_GROUP__AVAILABLE_PROJECTS);
 		}
@@ -306,7 +348,7 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAvailableComponents() {
+	public List<String> getAvailableComponents() {
 		if (availableComponents == null) {
 			availableComponents = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_REVIEW_GROUP__AVAILABLE_COMPONENTS);
 		}
@@ -317,7 +359,7 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getDesignRuleLocations() {
+	public List<String> getDesignRuleLocations() {
 		if (designRuleLocations == null) {
 			designRuleLocations = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_REVIEW_GROUP__DESIGN_RULE_LOCATIONS);
 		}
@@ -328,7 +370,7 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EAnomalyType> getAvailableAnomalyTypes() {
+	public List<R4EAnomalyType> getAvailableAnomalyTypes() {
 		if (availableAnomalyTypes == null) {
 			availableAnomalyTypes = new EObjectContainmentEList.Resolving<R4EAnomalyType>(R4EAnomalyType.class, this, RModelPackage.R4E_REVIEW_GROUP__AVAILABLE_ANOMALY_TYPES);
 		}
@@ -339,33 +381,33 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, R4EAnomalyType> getAnomalyTypeKeyToReference() {
+	public Map<String, R4EAnomalyType> getAnomalyTypeKeyToReference() {
 		if (anomalyTypeKeyToReference == null) {
 			anomalyTypeKeyToReference = new EcoreEMap<String,R4EAnomalyType>(RModelPackage.Literals.MAP_TO_ANOMALY_TYPE, MapToAnomalyTypeImpl.class, this, RModelPackage.R4E_REVIEW_GROUP__ANOMALY_TYPE_KEY_TO_REFERENCE);
 		}
-		return anomalyTypeKeyToReference;
+		return anomalyTypeKeyToReference.map();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, R4EReview> getReviewsMap() {
+	public Map<String, R4EReview> getReviewsMap() {
 		if (reviewsMap == null) {
 			reviewsMap = new EcoreEMap<String,R4EReview>(RModelPackage.Literals.MAP_NAME_TO_REVIEW, MapNameToReviewImpl.class, this, RModelPackage.R4E_REVIEW_GROUP__REVIEWS_MAP);
 		}
-		return reviewsMap;
+		return reviewsMap.map();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, R4EUserReviews> getUserReviews() {
+	public Map<String, R4EUserReviews> getUserReviews() {
 		if (userReviews == null) {
 			userReviews = new EcoreEMap<String,R4EUserReviews>(RModelPackage.Literals.MAP_USER_ID_TO_USER_REVIEWS, MapUserIDToUserReviewsImpl.class, this, RModelPackage.R4E_REVIEW_GROUP__USER_REVIEWS);
 		}
-		return userReviews;
+		return userReviews.map();
 	}
 
 	/**
@@ -378,11 +420,11 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 			case RModelPackage.R4E_REVIEW_GROUP__AVAILABLE_ANOMALY_TYPES:
 				return ((InternalEList<?>)getAvailableAnomalyTypes()).basicRemove(otherEnd, msgs);
 			case RModelPackage.R4E_REVIEW_GROUP__ANOMALY_TYPE_KEY_TO_REFERENCE:
-				return ((InternalEList<?>)getAnomalyTypeKeyToReference()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, R4EAnomalyType>)getAnomalyTypeKeyToReference()).eMap()).basicRemove(otherEnd, msgs);
 			case RModelPackage.R4E_REVIEW_GROUP__REVIEWS_MAP:
-				return ((InternalEList<?>)getReviewsMap()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, R4EReview>)getReviewsMap()).eMap()).basicRemove(otherEnd, msgs);
 			case RModelPackage.R4E_REVIEW_GROUP__USER_REVIEWS:
-				return ((InternalEList<?>)getUserReviews()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, R4EUserReviews>)getUserReviews()).eMap()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -396,6 +438,8 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 		switch (featureID) {
 			case RModelPackage.R4E_REVIEW_GROUP__ASSIGNED_TO:
 				return getAssignedTo();
+			case RModelPackage.R4E_REVIEW_GROUP__FRAGMENT_VERSION:
+				return getFragmentVersion();
 			case RModelPackage.R4E_REVIEW_GROUP__NAME:
 				return getName();
 			case RModelPackage.R4E_REVIEW_GROUP__FOLDER:
@@ -411,14 +455,14 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 			case RModelPackage.R4E_REVIEW_GROUP__AVAILABLE_ANOMALY_TYPES:
 				return getAvailableAnomalyTypes();
 			case RModelPackage.R4E_REVIEW_GROUP__ANOMALY_TYPE_KEY_TO_REFERENCE:
-				if (coreType) return getAnomalyTypeKeyToReference();
-				else return getAnomalyTypeKeyToReference().map();
+				if (coreType) return ((EMap.InternalMapView<String, R4EAnomalyType>)getAnomalyTypeKeyToReference()).eMap();
+				else return getAnomalyTypeKeyToReference();
 			case RModelPackage.R4E_REVIEW_GROUP__REVIEWS_MAP:
-				if (coreType) return getReviewsMap();
-				else return getReviewsMap().map();
+				if (coreType) return ((EMap.InternalMapView<String, R4EReview>)getReviewsMap()).eMap();
+				else return getReviewsMap();
 			case RModelPackage.R4E_REVIEW_GROUP__USER_REVIEWS:
-				if (coreType) return getUserReviews();
-				else return getUserReviews().map();
+				if (coreType) return ((EMap.InternalMapView<String, R4EUserReviews>)getUserReviews()).eMap();
+				else return getUserReviews();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -435,6 +479,9 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 				getAssignedTo().clear();
 				getAssignedTo().addAll((Collection<? extends String>)newValue);
 				return;
+			case RModelPackage.R4E_REVIEW_GROUP__FRAGMENT_VERSION:
+				setFragmentVersion((String)newValue);
+				return;
 			case RModelPackage.R4E_REVIEW_GROUP__NAME:
 				setName((String)newValue);
 				return;
@@ -461,13 +508,13 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 				getAvailableAnomalyTypes().addAll((Collection<? extends R4EAnomalyType>)newValue);
 				return;
 			case RModelPackage.R4E_REVIEW_GROUP__ANOMALY_TYPE_KEY_TO_REFERENCE:
-				((EStructuralFeature.Setting)getAnomalyTypeKeyToReference()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, R4EAnomalyType>)getAnomalyTypeKeyToReference()).eMap()).set(newValue);
 				return;
 			case RModelPackage.R4E_REVIEW_GROUP__REVIEWS_MAP:
-				((EStructuralFeature.Setting)getReviewsMap()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, R4EReview>)getReviewsMap()).eMap()).set(newValue);
 				return;
 			case RModelPackage.R4E_REVIEW_GROUP__USER_REVIEWS:
-				((EStructuralFeature.Setting)getUserReviews()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, R4EUserReviews>)getUserReviews()).eMap()).set(newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -483,6 +530,9 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 			case RModelPackage.R4E_REVIEW_GROUP__ASSIGNED_TO:
 				getAssignedTo().clear();
 				return;
+			case RModelPackage.R4E_REVIEW_GROUP__FRAGMENT_VERSION:
+				setFragmentVersion(FRAGMENT_VERSION_EDEFAULT);
+				return;
 			case RModelPackage.R4E_REVIEW_GROUP__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -526,6 +576,8 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 		switch (featureID) {
 			case RModelPackage.R4E_REVIEW_GROUP__ASSIGNED_TO:
 				return assignedTo != null && !assignedTo.isEmpty();
+			case RModelPackage.R4E_REVIEW_GROUP__FRAGMENT_VERSION:
+				return FRAGMENT_VERSION_EDEFAULT == null ? fragmentVersion != null : !FRAGMENT_VERSION_EDEFAULT.equals(fragmentVersion);
 			case RModelPackage.R4E_REVIEW_GROUP__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case RModelPackage.R4E_REVIEW_GROUP__FOLDER:
@@ -562,6 +614,12 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelVersioning.class) {
+			switch (derivedFeatureID) {
+				case RModelPackage.R4E_REVIEW_GROUP__FRAGMENT_VERSION: return ReviewsPackage.MODEL_VERSIONING__FRAGMENT_VERSION;
+				default: return -1;
+			}
+		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
@@ -577,6 +635,12 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelVersioning.class) {
+			switch (baseFeatureID) {
+				case ReviewsPackage.MODEL_VERSIONING__FRAGMENT_VERSION: return RModelPackage.R4E_REVIEW_GROUP__FRAGMENT_VERSION;
+				default: return -1;
+			}
+		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
@@ -591,6 +655,8 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (assignedTo: ");
 		result.append(assignedTo);
+		result.append(", fragmentVersion: ");
+		result.append(fragmentVersion);
 		result.append(", name: ");
 		result.append(name);
 		result.append(", folder: ");
@@ -607,22 +673,4 @@ public class R4EReviewGroupImpl extends ReviewGroupImpl implements R4EReviewGrou
 		return result.toString();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl#getCompatibility()
-	 */
-	public int getCompatibility() {
-		return VersionUtils.compareVersions(Roots.GROUP.getVersion(), fragmentVersion);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewGroupImpl#getApplicationVersion()
-	 */
-	public String getApplicationVersion() {
-		return Persistence.Roots.GROUP.getVersion();
-	}
-
 } //R4EReviewGroupImpl
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewImpl.java
index d7e43400..70dc2d91 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewImpl.java
@@ -1,7 +1,6 @@
 /**
-/**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -17,6 +16,8 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -29,7 +30,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.internal.core.model.Review;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EID;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent;
@@ -40,9 +43,6 @@ import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewDecision;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUser;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence;
-import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.Roots;
-import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>R4E Review</b></em>'. <!-- end-user-doc -->
@@ -50,6 +50,7 @@ import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getAssignedTo <em>Assigned To</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getFragmentVersion <em>Fragment Version</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getProject <em>Project</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getComponents <em>Components</em>}</li>
@@ -61,6 +62,7 @@ import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getStartDate <em>Start Date</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getEndDate <em>End Date</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getDueDate <em>Due Date</em>}</li>
+ *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getModifiedDate <em>Modified Date</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getAnomalyTemplate <em>Anomaly Template</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl#getUsersMap <em>Users Map</em>}</li>
@@ -72,7 +74,7 @@ import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
  *
  * @generated
  */
-public class R4EReviewImpl extends ReviewImpl implements R4EReview {
+public class R4EReviewImpl extends Review implements R4EReview {
 	/**
 	 * The cached value of the '{@link #getAssignedTo() <em>Assigned To</em>}' attribute list.
 	 * <!-- begin-user-doc -->
@@ -84,6 +86,26 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	protected EList<String> assignedTo;
 
 	/**
+	 * The default value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @see #getFragmentVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FRAGMENT_VERSION_EDEFAULT = "1.0.0";
+
+	/**
+	 * The cached value of the '{@link #getFragmentVersion() <em>Fragment Version</em>}' attribute.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @see #getFragmentVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fragmentVersion = FRAGMENT_VERSION_EDEFAULT;
+
+	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -284,6 +306,26 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	protected Date dueDate = DUE_DATE_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getModifiedDate() <em>Modified Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getModifiedDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Date MODIFIED_DATE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getModifiedDate() <em>Modified Date</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getModifiedDate()
+	 * @generated
+	 * @ordered
+	 */
+	protected Date modifiedDate = MODIFIED_DATE_EDEFAULT;
+
+	/**
 	 * The cached value of the '{@link #getAnomalyTemplate() <em>Anomaly Template</em>}' containment reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -301,7 +343,7 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EReviewType TYPE_EDEFAULT = R4EReviewType.R4E_REVIEW_TYPE_BASIC;
+	protected static final R4EReviewType TYPE_EDEFAULT = R4EReviewType.BASIC;
 
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -374,7 +416,7 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAssignedTo() {
+	public List<String> getAssignedTo() {
 		if (assignedTo == null) {
 			assignedTo = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_REVIEW__ASSIGNED_TO);
 		}
@@ -385,6 +427,48 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getFragmentVersion() {
+		return fragmentVersion;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFragmentVersion(String newFragmentVersion) {
+		String oldFragmentVersion = fragmentVersion;
+		fragmentVersion = newFragmentVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_REVIEW__FRAGMENT_VERSION, oldFragmentVersion, fragmentVersion));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-user-doc --> In R4E, the name is the same as ID. <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getId() {
+		// TODO Auto-generated method stub
+		return getName();
+	}
+
+	/**
+	 * <!-- begin-user-doc --> In R4E, the name is the same as ID so it is not appropriate to set a value for it. <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public void setId(String newId) {
+		throw new UnsupportedOperationException("This value is derived in R4E. Use setName() instead.");
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String getName() {
 		return name;
 	}
@@ -423,7 +507,7 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getComponents() {
+	public List<String> getComponents() {
 		if (components == null) {
 			components = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_REVIEW__COMPONENTS);
 		}
@@ -629,6 +713,25 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
+	public Date getModifiedDate() {
+		return modifiedDate;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setModifiedDate(Date newModifiedDate) {
+		Date oldModifiedDate = modifiedDate;
+		modifiedDate = newModifiedDate;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_REVIEW__MODIFIED_DATE, oldModifiedDate, modifiedDate));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
 	public R4EAnomaly getAnomalyTemplate() {
 		if (anomalyTemplate != null && anomalyTemplate.eIsProxy()) {
 			InternalEObject oldAnomalyTemplate = (InternalEObject)anomalyTemplate;
@@ -710,22 +813,57 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, R4EUser> getUsersMap() {
+	public Map<String, R4EUser> getUsersMap() {
 		if (usersMap == null) {
 			usersMap = new EcoreEMap<String,R4EUser>(RModelPackage.Literals.MAP_TO_USERS, MapToUsersImpl.class, this, RModelPackage.R4E_REVIEW__USERS_MAP);
 		}
-		return usersMap;
+		return usersMap.map();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<R4EID, R4EIDComponent> getIdsMap() {
+	public R4EUser getCreatedBy() {
+		if (createdBy != null && createdBy.eIsProxy()) {
+			InternalEObject oldCreatedBy = (InternalEObject)createdBy;
+			createdBy = (R4EUser)eResolveProxy(oldCreatedBy);
+			if (createdBy != oldCreatedBy) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_REVIEW__CREATED_BY, oldCreatedBy, createdBy));
+			}
+		}
+		return createdBy;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public R4EUser basicGetCreatedBy() {
+		return createdBy;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCreatedBy(R4EUser newCreatedBy) {
+		R4EUser oldCreatedBy = createdBy;
+		createdBy = newCreatedBy;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_REVIEW__CREATED_BY, oldCreatedBy, createdBy));
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Map<R4EID, R4EIDComponent> getIdsMap() {
 		if (idsMap == null) {
 			idsMap = new EcoreEMap<R4EID,R4EIDComponent>(RModelPackage.Literals.MAP_ID_TO_COMPONENT, MapIDToComponentImpl.class, this, RModelPackage.R4E_REVIEW__IDS_MAP);
 		}
-		return idsMap;
+		return idsMap.map();
 	}
 
 	/**
@@ -794,41 +932,6 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public R4EUser getCreatedBy() {
-		if (createdBy != null && createdBy.eIsProxy()) {
-			InternalEObject oldCreatedBy = (InternalEObject)createdBy;
-			createdBy = (R4EUser)eResolveProxy(oldCreatedBy);
-			if (createdBy != oldCreatedBy) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RModelPackage.R4E_REVIEW__CREATED_BY, oldCreatedBy, createdBy));
-			}
-		}
-		return createdBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public R4EUser basicGetCreatedBy() {
-		return createdBy;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreatedBy(R4EUser newCreatedBy) {
-		R4EUser oldCreatedBy = createdBy;
-		createdBy = newCreatedBy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RModelPackage.R4E_REVIEW__CREATED_BY, oldCreatedBy, createdBy));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -837,9 +940,9 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 			case RModelPackage.R4E_REVIEW__ANOMALY_TEMPLATE:
 				return basicSetAnomalyTemplate(null, msgs);
 			case RModelPackage.R4E_REVIEW__USERS_MAP:
-				return ((InternalEList<?>)getUsersMap()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, R4EUser>)getUsersMap()).eMap()).basicRemove(otherEnd, msgs);
 			case RModelPackage.R4E_REVIEW__IDS_MAP:
-				return ((InternalEList<?>)getIdsMap()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<R4EID, R4EIDComponent>)getIdsMap()).eMap()).basicRemove(otherEnd, msgs);
 			case RModelPackage.R4E_REVIEW__ACTIVE_MEETING:
 				return basicSetActiveMeeting(null, msgs);
 		}
@@ -855,6 +958,8 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 		switch (featureID) {
 			case RModelPackage.R4E_REVIEW__ASSIGNED_TO:
 				return getAssignedTo();
+			case RModelPackage.R4E_REVIEW__FRAGMENT_VERSION:
+				return getFragmentVersion();
 			case RModelPackage.R4E_REVIEW__NAME:
 				return getName();
 			case RModelPackage.R4E_REVIEW__PROJECT:
@@ -878,20 +983,22 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 				return getEndDate();
 			case RModelPackage.R4E_REVIEW__DUE_DATE:
 				return getDueDate();
+			case RModelPackage.R4E_REVIEW__MODIFIED_DATE:
+				return getModifiedDate();
 			case RModelPackage.R4E_REVIEW__ANOMALY_TEMPLATE:
 				if (resolve) return getAnomalyTemplate();
 				return basicGetAnomalyTemplate();
 			case RModelPackage.R4E_REVIEW__TYPE:
 				return getType();
 			case RModelPackage.R4E_REVIEW__USERS_MAP:
-				if (coreType) return getUsersMap();
-				else return getUsersMap().map();
+				if (coreType) return ((EMap.InternalMapView<String, R4EUser>)getUsersMap()).eMap();
+				else return getUsersMap();
 			case RModelPackage.R4E_REVIEW__CREATED_BY:
 				if (resolve) return getCreatedBy();
 				return basicGetCreatedBy();
 			case RModelPackage.R4E_REVIEW__IDS_MAP:
-				if (coreType) return getIdsMap();
-				else return getIdsMap().map();
+				if (coreType) return ((EMap.InternalMapView<R4EID, R4EIDComponent>)getIdsMap()).eMap();
+				else return getIdsMap();
 			case RModelPackage.R4E_REVIEW__ACTIVE_MEETING:
 				if (resolve) return getActiveMeeting();
 				return basicGetActiveMeeting();
@@ -911,6 +1018,9 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 				getAssignedTo().clear();
 				getAssignedTo().addAll((Collection<? extends String>)newValue);
 				return;
+			case RModelPackage.R4E_REVIEW__FRAGMENT_VERSION:
+				setFragmentVersion((String)newValue);
+				return;
 			case RModelPackage.R4E_REVIEW__NAME:
 				setName((String)newValue);
 				return;
@@ -945,6 +1055,9 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 			case RModelPackage.R4E_REVIEW__DUE_DATE:
 				setDueDate((Date)newValue);
 				return;
+			case RModelPackage.R4E_REVIEW__MODIFIED_DATE:
+				setModifiedDate((Date)newValue);
+				return;
 			case RModelPackage.R4E_REVIEW__ANOMALY_TEMPLATE:
 				setAnomalyTemplate((R4EAnomaly)newValue);
 				return;
@@ -952,13 +1065,13 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 				setType((R4EReviewType)newValue);
 				return;
 			case RModelPackage.R4E_REVIEW__USERS_MAP:
-				((EStructuralFeature.Setting)getUsersMap()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, R4EUser>)getUsersMap()).eMap()).set(newValue);
 				return;
 			case RModelPackage.R4E_REVIEW__CREATED_BY:
 				setCreatedBy((R4EUser)newValue);
 				return;
 			case RModelPackage.R4E_REVIEW__IDS_MAP:
-				((EStructuralFeature.Setting)getIdsMap()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<R4EID, R4EIDComponent>)getIdsMap()).eMap()).set(newValue);
 				return;
 			case RModelPackage.R4E_REVIEW__ACTIVE_MEETING:
 				setActiveMeeting((R4EMeetingData)newValue);
@@ -977,6 +1090,9 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 			case RModelPackage.R4E_REVIEW__ASSIGNED_TO:
 				getAssignedTo().clear();
 				return;
+			case RModelPackage.R4E_REVIEW__FRAGMENT_VERSION:
+				setFragmentVersion(FRAGMENT_VERSION_EDEFAULT);
+				return;
 			case RModelPackage.R4E_REVIEW__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -1010,6 +1126,9 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 			case RModelPackage.R4E_REVIEW__DUE_DATE:
 				setDueDate(DUE_DATE_EDEFAULT);
 				return;
+			case RModelPackage.R4E_REVIEW__MODIFIED_DATE:
+				setModifiedDate(MODIFIED_DATE_EDEFAULT);
+				return;
 			case RModelPackage.R4E_REVIEW__ANOMALY_TEMPLATE:
 				setAnomalyTemplate((R4EAnomaly)null);
 				return;
@@ -1041,6 +1160,8 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 		switch (featureID) {
 			case RModelPackage.R4E_REVIEW__ASSIGNED_TO:
 				return assignedTo != null && !assignedTo.isEmpty();
+			case RModelPackage.R4E_REVIEW__FRAGMENT_VERSION:
+				return FRAGMENT_VERSION_EDEFAULT == null ? fragmentVersion != null : !FRAGMENT_VERSION_EDEFAULT.equals(fragmentVersion);
 			case RModelPackage.R4E_REVIEW__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case RModelPackage.R4E_REVIEW__PROJECT:
@@ -1063,6 +1184,8 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 				return END_DATE_EDEFAULT == null ? endDate != null : !END_DATE_EDEFAULT.equals(endDate);
 			case RModelPackage.R4E_REVIEW__DUE_DATE:
 				return DUE_DATE_EDEFAULT == null ? dueDate != null : !DUE_DATE_EDEFAULT.equals(dueDate);
+			case RModelPackage.R4E_REVIEW__MODIFIED_DATE:
+				return MODIFIED_DATE_EDEFAULT == null ? modifiedDate != null : !MODIFIED_DATE_EDEFAULT.equals(modifiedDate);
 			case RModelPackage.R4E_REVIEW__ANOMALY_TEMPLATE:
 				return anomalyTemplate != null;
 			case RModelPackage.R4E_REVIEW__TYPE:
@@ -1091,6 +1214,12 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelVersioning.class) {
+			switch (derivedFeatureID) {
+				case RModelPackage.R4E_REVIEW__FRAGMENT_VERSION: return ReviewsPackage.MODEL_VERSIONING__FRAGMENT_VERSION;
+				default: return -1;
+			}
+		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 	}
 
@@ -1106,6 +1235,12 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 				default: return -1;
 			}
 		}
+		if (baseClass == IModelVersioning.class) {
+			switch (baseFeatureID) {
+				case ReviewsPackage.MODEL_VERSIONING__FRAGMENT_VERSION: return RModelPackage.R4E_REVIEW__FRAGMENT_VERSION;
+				default: return -1;
+			}
+		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
@@ -1120,6 +1255,8 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (assignedTo: ");
 		result.append(assignedTo);
+		result.append(", fragmentVersion: ");
+		result.append(fragmentVersion);
 		result.append(", name: ");
 		result.append(name);
 		result.append(", project: ");
@@ -1140,27 +1277,12 @@ public class R4EReviewImpl extends ReviewImpl implements R4EReview {
 		result.append(endDate);
 		result.append(", dueDate: ");
 		result.append(dueDate);
+		result.append(", modifiedDate: ");
+		result.append(modifiedDate);
 		result.append(", type: ");
 		result.append(type);
 		result.append(')');
 		return result.toString();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getCompatibility()
-	 */
-	public int getCompatibility() {
-		return VersionUtils.compareVersions(Roots.REVIEW.getVersion(), fragmentVersion);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewImpl#getApplicationVersion()
-	 */
-	public String getApplicationVersion() {
-		return Persistence.Roots.REVIEW.getVersion();
-	}
 } //R4EReviewImpl
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewPhaseInfoImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewPhaseInfoImpl.java
index d4c081d5..fd9b208f 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewPhaseInfoImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewPhaseInfoImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -17,12 +17,9 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 import java.util.Date;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhaseInfo;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
@@ -71,7 +68,7 @@ public class R4EReviewPhaseInfoImpl extends EObjectImpl implements R4EReviewPhas
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EReviewPhase TYPE_EDEFAULT = R4EReviewPhase.R4E_REVIEW_PHASE_STARTED;
+	protected static final R4EReviewPhase TYPE_EDEFAULT = R4EReviewPhase.STARTED;
 
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewStateImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewStateImpl.java
index c169002d..5dda6fc1 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewStateImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EReviewStateImpl.java
@@ -1,7 +1,6 @@
 /**
-/**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -18,7 +17,7 @@ package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.ReviewStateImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewState;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
@@ -35,7 +34,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  * 
  * @generated
  */
-public class R4EReviewStateImpl extends ReviewStateImpl implements R4EReviewState {
+public class R4EReviewStateImpl extends ReviewState implements R4EReviewState {
 	/**
 	 * The default value of the '{@link #getState() <em>State</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
@@ -44,7 +43,7 @@ public class R4EReviewStateImpl extends ReviewStateImpl implements R4EReviewStat
 	 * @generated
 	 * @ordered
 	 */
-	protected static final R4EReviewPhase STATE_EDEFAULT = R4EReviewPhase.R4E_REVIEW_PHASE_STARTED;
+	protected static final R4EReviewPhase STATE_EDEFAULT = R4EReviewPhase.STARTED;
 
 	/**
 	 * The cached value of the '{@link #getState() <em>State</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ETaskReferenceImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ETaskReferenceImpl.java
index e5c58f36..ae21eeb4 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ETaskReferenceImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ETaskReferenceImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,10 +15,12 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
+import java.util.List;
+
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.TaskReferenceImpl;
+import org.eclipse.mylyn.reviews.internal.core.model.TaskReference;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ETaskReference;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
@@ -35,7 +37,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  * 
  * @generated
  */
-public class R4ETaskReferenceImpl extends TaskReferenceImpl implements R4ETaskReference {
+public class R4ETaskReferenceImpl extends TaskReference implements R4ETaskReference {
 	/**
 	 * The cached value of the '{@link #getAssignedTo() <em>Assigned To</em>}' attribute list.
 	 * <!-- begin-user-doc -->
@@ -67,7 +69,7 @@ public class R4ETaskReferenceImpl extends TaskReferenceImpl implements R4ETaskRe
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAssignedTo() {
+	public List<String> getAssignedTo() {
 		if (assignedTo == null) {
 			assignedTo = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_TASK_REFERENCE__ASSIGNED_TO);
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ETextPositionImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ETextPositionImpl.java
index 8e273da5..ddbb9060 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ETextPositionImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4ETextPositionImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,11 +15,8 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ETextPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EUserImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EUserImpl.java
index 1e6d7eb9..bd49ceba 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EUserImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EUserImpl.java
@@ -16,6 +16,7 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
+import java.util.List;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -26,9 +27,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.impl.UserImpl;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
+import org.eclipse.mylyn.reviews.internal.core.model.User;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EItem;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
@@ -37,7 +38,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.R4EUser;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>R4E User</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>R4E User</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
@@ -56,7 +57,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
  *
  * @generated
  */
-public class R4EUserImpl extends UserImpl implements R4EUser {
+public class R4EUserImpl extends User implements R4EUser {
 	/**
 	 * The default value of the '{@link #isEnabled() <em>Enabled</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
@@ -247,7 +248,7 @@ public class R4EUserImpl extends UserImpl implements R4EUser {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getAssignedTo() {
+	public List<String> getAssignedTo() {
 		if (assignedTo == null) {
 			assignedTo = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_USER__ASSIGNED_TO);
 		}
@@ -258,7 +259,7 @@ public class R4EUserImpl extends UserImpl implements R4EUser {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getGroupPaths() {
+	public List<String> getGroupPaths() {
 		if (groupPaths == null) {
 			groupPaths = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_USER__GROUP_PATHS);
 		}
@@ -288,7 +289,7 @@ public class R4EUserImpl extends UserImpl implements R4EUser {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EComment> getAddedComments() {
+	public List<R4EComment> getAddedComments() {
 		if (addedComments == null) {
 			addedComments = new EObjectContainmentEList.Resolving<R4EComment>(R4EComment.class, this, RModelPackage.R4E_USER__ADDED_COMMENTS);
 		}
@@ -299,7 +300,7 @@ public class R4EUserImpl extends UserImpl implements R4EUser {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<R4EItem> getAddedItems() {
+	public List<R4EItem> getAddedItems() {
 		if (addedItems == null) {
 			addedItems = new EObjectContainmentEList.Resolving<R4EItem>(R4EItem.class, this, RModelPackage.R4E_USER__ADDED_ITEMS);
 		}
@@ -416,7 +417,9 @@ public class R4EUserImpl extends UserImpl implements R4EUser {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.R4EUser#getSequenceIDCounterNext()
+	 * @see
+	 * org.eclipse.mylyn.reviews.r4e.core.model.R4EUser#getSequenceIDCounterNext
+	 * ()
 	 */
 	public int getSequenceIDCounterNext() {
 		int count = getSequenceIDCounter() + 1;
@@ -580,9 +583,9 @@ public class R4EUserImpl extends UserImpl implements R4EUser {
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ReviewComponent.class) {
+		if (baseClass == IReviewComponent.class) {
 			switch (derivedFeatureID) {
-				case RModelPackage.R4E_USER__ENABLED: return ModelPackage.REVIEW_COMPONENT__ENABLED;
+				case RModelPackage.R4E_USER__ENABLED: return ReviewsPackage.REVIEW_COMPONENT__ENABLED;
 				default: return -1;
 			}
 		}
@@ -601,9 +604,9 @@ public class R4EUserImpl extends UserImpl implements R4EUser {
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ReviewComponent.class) {
+		if (baseClass == IReviewComponent.class) {
 			switch (baseFeatureID) {
-				case ModelPackage.REVIEW_COMPONENT__ENABLED: return RModelPackage.R4E_USER__ENABLED;
+				case ReviewsPackage.REVIEW_COMPONENT__ENABLED: return RModelPackage.R4E_USER__ENABLED;
 				default: return -1;
 			}
 		}
@@ -643,4 +646,4 @@ public class R4EUserImpl extends UserImpl implements R4EUser {
 		return result.toString();
 	}
 
-} //R4EUserImpl
+} // R4EUserImpl
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EUserReviewsImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EUserReviewsImpl.java
index f766d38f..8f2d0e38 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EUserReviewsImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/R4EUserReviewsImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -15,23 +15,21 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.impl;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUserReviews;
@@ -144,11 +142,11 @@ public class R4EUserReviewsImpl extends EObjectImpl implements R4EUserReviews {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EMap<String, R4EReview> getInvitedToMap() {
+	public Map<String, R4EReview> getInvitedToMap() {
 		if (invitedToMap == null) {
 			invitedToMap = new EcoreEMap<String,R4EReview>(RModelPackage.Literals.MAP_NAME_TO_REVIEW, MapNameToReviewImpl.class, this, RModelPackage.R4E_USER_REVIEWS__INVITED_TO_MAP);
 		}
-		return invitedToMap;
+		return invitedToMap.map();
 	}
 
 	/**
@@ -190,7 +188,7 @@ public class R4EUserReviewsImpl extends EObjectImpl implements R4EUserReviews {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<String> getCreatedReviews() {
+	public List<String> getCreatedReviews() {
 		if (createdReviews == null) {
 			createdReviews = new EDataTypeUniqueEList<String>(String.class, this, RModelPackage.R4E_USER_REVIEWS__CREATED_REVIEWS);
 		}
@@ -205,7 +203,7 @@ public class R4EUserReviewsImpl extends EObjectImpl implements R4EUserReviews {
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case RModelPackage.R4E_USER_REVIEWS__INVITED_TO_MAP:
-				return ((InternalEList<?>)getInvitedToMap()).basicRemove(otherEnd, msgs);
+				return ((InternalEList<?>)((EMap.InternalMapView<String, R4EReview>)getInvitedToMap()).eMap()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -220,8 +218,8 @@ public class R4EUserReviewsImpl extends EObjectImpl implements R4EUserReviews {
 			case RModelPackage.R4E_USER_REVIEWS__NAME:
 				return getName();
 			case RModelPackage.R4E_USER_REVIEWS__INVITED_TO_MAP:
-				if (coreType) return getInvitedToMap();
-				else return getInvitedToMap().map();
+				if (coreType) return ((EMap.InternalMapView<String, R4EReview>)getInvitedToMap()).eMap();
+				else return getInvitedToMap();
 			case RModelPackage.R4E_USER_REVIEWS__GROUP:
 				if (resolve) return getGroup();
 				return basicGetGroup();
@@ -243,7 +241,7 @@ public class R4EUserReviewsImpl extends EObjectImpl implements R4EUserReviews {
 				setName((String)newValue);
 				return;
 			case RModelPackage.R4E_USER_REVIEWS__INVITED_TO_MAP:
-				((EStructuralFeature.Setting)getInvitedToMap()).set(newValue);
+				((EStructuralFeature.Setting)((EMap.InternalMapView<String, R4EReview>)getInvitedToMap()).eMap()).set(newValue);
 				return;
 			case RModelPackage.R4E_USER_REVIEWS__GROUP:
 				setGroup((R4EReviewGroup)newValue);
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/RModelFactoryImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/RModelFactoryImpl.java
index 96565762..a9b357ab 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/RModelFactoryImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/RModelFactoryImpl.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.mylyn.reviews.r4e.core.model.*;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyState;
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/RModelPackageImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/RModelPackageImpl.java
index c53c4e12..00e79be4 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/RModelPackageImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/impl/RModelPackageImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, 2012 Ericsson
- *  
+ * 
  * 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
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.mylyn.reviews.frame.core.model.ModelPackage;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
@@ -571,11 +571,20 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getR4EReview_ModifiedDate() {
+		return (EAttribute)r4EReviewEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EReference getR4EReview_AnomalyTemplate() {
-		return (EReference)r4EReviewEClass.getEStructuralFeatures().get(11);
+		return (EReference)r4EReviewEClass.getEStructuralFeatures().get(12);
 	}
 
 	/**
@@ -583,7 +592,7 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 	 * @generated
 	 */
 	public EAttribute getR4EReview_Type() {
-		return (EAttribute)r4EReviewEClass.getEStructuralFeatures().get(12);
+		return (EAttribute)r4EReviewEClass.getEStructuralFeatures().get(13);
 	}
 
 	/**
@@ -591,14 +600,14 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 	 * @generated
 	 */
 	public EReference getR4EReview_UsersMap() {
-		return (EReference)r4EReviewEClass.getEStructuralFeatures().get(13);
+		return (EReference)r4EReviewEClass.getEStructuralFeatures().get(14);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getR4EReview_IdsMap() {
+	public EReference getR4EReview_CreatedBy() {
 		return (EReference)r4EReviewEClass.getEStructuralFeatures().get(15);
 	}
 
@@ -606,7 +615,7 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getR4EReview_ActiveMeeting() {
+	public EReference getR4EReview_IdsMap() {
 		return (EReference)r4EReviewEClass.getEStructuralFeatures().get(16);
 	}
 
@@ -614,8 +623,8 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getR4EReview_CreatedBy() {
-		return (EReference)r4EReviewEClass.getEStructuralFeatures().get(14);
+	public EReference getR4EReview_ActiveMeeting() {
+		return (EReference)r4EReviewEClass.getEStructuralFeatures().get(17);
 	}
 
 	/**
@@ -1446,7 +1455,7 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getR4EIDComponent_Id() {
+	public EReference getR4EIDComponent_R4eId() {
 		return (EReference)r4EIDComponentEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -1803,6 +1812,7 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 		createEAttribute(r4EReviewEClass, R4E_REVIEW__START_DATE);
 		createEAttribute(r4EReviewEClass, R4E_REVIEW__END_DATE);
 		createEAttribute(r4EReviewEClass, R4E_REVIEW__DUE_DATE);
+		createEAttribute(r4EReviewEClass, R4E_REVIEW__MODIFIED_DATE);
 		createEReference(r4EReviewEClass, R4E_REVIEW__ANOMALY_TEMPLATE);
 		createEAttribute(r4EReviewEClass, R4E_REVIEW__TYPE);
 		createEReference(r4EReviewEClass, R4E_REVIEW__USERS_MAP);
@@ -1937,7 +1947,7 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 		createEAttribute(r4EUserReviewsEClass, R4E_USER_REVIEWS__CREATED_REVIEWS);
 
 		r4EIDComponentEClass = createEClass(R4EID_COMPONENT);
-		createEReference(r4EIDComponentEClass, R4EID_COMPONENT__ID);
+		createEReference(r4EIDComponentEClass, R4EID_COMPONENT__R4E_ID);
 
 		mapIDToComponentEClass = createEClass(MAP_ID_TO_COMPONENT);
 		createEReference(mapIDToComponentEClass, MAP_ID_TO_COMPONENT__KEY);
@@ -2011,7 +2021,7 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		ModelPackage theModelPackage = (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
+		ReviewsPackage theReviewsPackage = (ReviewsPackage)EPackage.Registry.INSTANCE.getEPackage(ReviewsPackage.eNS_URI);
 		DRModelPackage theDRModelPackage = (DRModelPackage)EPackage.Registry.INSTANCE.getEPackage(DRModelPackage.eNS_URI);
 
 		// Create type parameters
@@ -2019,33 +2029,35 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		r4EReviewGroupEClass.getESuperTypes().add(theModelPackage.getReviewGroup());
+		r4EReviewGroupEClass.getESuperTypes().add(theReviewsPackage.getReviewGroup());
 		r4EReviewGroupEClass.getESuperTypes().add(this.getR4EReviewComponent());
-		r4EReviewEClass.getESuperTypes().add(theModelPackage.getReview());
+		r4EReviewGroupEClass.getESuperTypes().add(theReviewsPackage.getModelVersioning());
+		r4EReviewEClass.getESuperTypes().add(theReviewsPackage.getReview());
 		r4EReviewEClass.getESuperTypes().add(this.getR4EReviewComponent());
-		r4EAnomalyEClass.getESuperTypes().add(theModelPackage.getTopic());
+		r4EReviewEClass.getESuperTypes().add(theReviewsPackage.getModelVersioning());
+		r4EAnomalyEClass.getESuperTypes().add(theReviewsPackage.getTopic());
 		r4EAnomalyEClass.getESuperTypes().add(this.getR4EReviewComponent());
 		r4EAnomalyEClass.getESuperTypes().add(this.getR4EComment());
 		r4EFormalReviewEClass.getESuperTypes().add(this.getR4EReview());
 		r4ETextPositionEClass.getESuperTypes().add(this.getR4EPosition());
-		r4EUserEClass.getESuperTypes().add(theModelPackage.getUser());
+		r4EUserEClass.getESuperTypes().add(theReviewsPackage.getUser());
 		r4EUserEClass.getESuperTypes().add(this.getR4EReviewComponent());
 		r4EParticipantEClass.getESuperTypes().add(this.getR4EUser());
 		r4EItemEClass.getESuperTypes().add(this.getR4EIDComponent());
-		r4EItemEClass.getESuperTypes().add(theModelPackage.getItem());
+		r4EItemEClass.getESuperTypes().add(theReviewsPackage.getReviewItem());
 		r4ETextContentEClass.getESuperTypes().add(this.getR4EContent());
-		r4EAnomalyTypeEClass.getESuperTypes().add(theModelPackage.getCommentType());
-		r4ETaskReferenceEClass.getESuperTypes().add(theModelPackage.getTaskReference());
+		r4EAnomalyTypeEClass.getESuperTypes().add(theReviewsPackage.getCommentType());
+		r4ETaskReferenceEClass.getESuperTypes().add(theReviewsPackage.getTaskReference());
 		r4ETaskReferenceEClass.getESuperTypes().add(this.getR4EReviewComponent());
-		r4EReviewStateEClass.getESuperTypes().add(theModelPackage.getReviewState());
-		r4ECommentEClass.getESuperTypes().add(theModelPackage.getComment());
+		r4EReviewStateEClass.getESuperTypes().add(theReviewsPackage.getReviewState());
+		r4ECommentEClass.getESuperTypes().add(theReviewsPackage.getComment());
 		r4ECommentEClass.getESuperTypes().add(this.getR4EReviewComponent());
 		r4ECommentEClass.getESuperTypes().add(this.getR4EIDComponent());
-		r4EReviewComponentEClass.getESuperTypes().add(theModelPackage.getReviewComponent());
+		r4EReviewComponentEClass.getESuperTypes().add(theReviewsPackage.getReviewComponent());
 		r4EFileContextEClass.getESuperTypes().add(this.getR4EIDComponent());
 		r4EDeltaEClass.getESuperTypes().add(this.getR4EIDComponent());
-		r4ECommentTypeEClass.getESuperTypes().add(theModelPackage.getCommentType());
-		r4EContentEClass.getESuperTypes().add(theModelPackage.getLocation());
+		r4ECommentTypeEClass.getESuperTypes().add(theReviewsPackage.getCommentType());
+		r4EContentEClass.getESuperTypes().add(theReviewsPackage.getLocation());
 		r4EIDComponentEClass.getESuperTypes().add(this.getR4EReviewComponent());
 		r4EAnomalyTextPositionEClass.getESuperTypes().add(this.getR4ETextPosition());
 
@@ -2074,6 +2086,7 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 		initEAttribute(getR4EReview_StartDate(), ecorePackage.getEDate(), "startDate", null, 0, 1, R4EReview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getR4EReview_EndDate(), ecorePackage.getEDate(), "endDate", null, 0, 1, R4EReview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getR4EReview_DueDate(), ecorePackage.getEDate(), "dueDate", null, 0, 1, R4EReview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getR4EReview_ModifiedDate(), ecorePackage.getEDate(), "modifiedDate", null, 0, 1, R4EReview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getR4EReview_AnomalyTemplate(), this.getR4EAnomaly(), null, "anomalyTemplate", null, 1, 1, R4EReview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getR4EReview_Type(), this.getR4EReviewType(), "type", "", 0, 1, R4EReview.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getR4EReview_UsersMap(), this.getMapToUsers(), null, "usersMap", null, 0, -1, R4EReview.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
@@ -2208,7 +2221,7 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 		initEAttribute(getR4EUserReviews_CreatedReviews(), ecorePackage.getEString(), "createdReviews", null, 0, -1, R4EUserReviews.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(r4EIDComponentEClass, R4EIDComponent.class, "R4EIDComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getR4EIDComponent_Id(), this.getR4EID(), null, "id", null, 0, 1, R4EIDComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getR4EIDComponent_R4eId(), this.getR4EID(), null, "r4eId", null, 0, 1, R4EIDComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(mapIDToComponentEClass, Map.Entry.class, "MapIDToComponent", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMapIDToComponent_Key(), this.getR4EID(), null, "key", null, 1, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2248,45 +2261,45 @@ public class RModelPackageImpl extends EPackageImpl implements RModelPackage {
 
 		// Initialize enums and add enum literals
 		initEEnum(r4EAnomalyStateEEnum, R4EAnomalyState.class, "R4EAnomalyState");
-		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.R4E_ANOMALY_STATE_CREATED);
-		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED);
-		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
-		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
-		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED);
+		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.CREATED);
+		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.ASSIGNED);
+		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.ACCEPTED);
+		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.FIXED);
+		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.DUPLICATED);
+		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.REJECTED);
+		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.DEFERRED);
+		addEEnumLiteral(r4EAnomalyStateEEnum, R4EAnomalyState.VERIFIED);
 
 		initEEnum(r4EReviewPhaseEEnum, R4EReviewPhase.class, "R4EReviewPhase");
-		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.R4E_REVIEW_PHASE_STARTED);
-		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION);
-		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.R4E_REVIEW_PHASE_DECISION);
-		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.R4E_REVIEW_PHASE_REWORK);
-		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.STARTED);
+		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.PREPARATION);
+		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.DECISION);
+		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.REWORK);
+		addEEnumLiteral(r4EReviewPhaseEEnum, R4EReviewPhase.COMPLETED);
 
 		initEEnum(r4EUserRoleEEnum, R4EUserRole.class, "R4EUserRole");
-		addEEnumLiteral(r4EUserRoleEEnum, R4EUserRole.R4E_ROLE_REVIEWER);
-		addEEnumLiteral(r4EUserRoleEEnum, R4EUserRole.R4E_ROLE_LEAD);
-		addEEnumLiteral(r4EUserRoleEEnum, R4EUserRole.R4E_ROLE_AUTHOR);
-		addEEnumLiteral(r4EUserRoleEEnum, R4EUserRole.R4E_ROLE_ORGANIZER);
+		addEEnumLiteral(r4EUserRoleEEnum, R4EUserRole.REVIEWER);
+		addEEnumLiteral(r4EUserRoleEEnum, R4EUserRole.LEAD);
+		addEEnumLiteral(r4EUserRoleEEnum, R4EUserRole.AUTHOR);
+		addEEnumLiteral(r4EUserRoleEEnum, R4EUserRole.ORGANIZER);
 
 		initEEnum(r4EDecisionEEnum, R4EDecision.class, "R4EDecision");
-		addEEnumLiteral(r4EDecisionEEnum, R4EDecision.R4E_REVIEW_DECISION_NONE);
-		addEEnumLiteral(r4EDecisionEEnum, R4EDecision.R4E_REVIEW_DECISION_ACCEPTED);
-		addEEnumLiteral(r4EDecisionEEnum, R4EDecision.R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP);
-		addEEnumLiteral(r4EDecisionEEnum, R4EDecision.R4E_REVIEW_DECISION_REJECTED);
+		addEEnumLiteral(r4EDecisionEEnum, R4EDecision.NONE);
+		addEEnumLiteral(r4EDecisionEEnum, R4EDecision.ACCEPTED);
+		addEEnumLiteral(r4EDecisionEEnum, R4EDecision.ACCEPTED_FOLLOWUP);
+		addEEnumLiteral(r4EDecisionEEnum, R4EDecision.REJECTED);
 
 		initEEnum(r4EReviewTypeEEnum, R4EReviewType.class, "R4EReviewType");
-		addEEnumLiteral(r4EReviewTypeEEnum, R4EReviewType.R4E_REVIEW_TYPE_BASIC);
-		addEEnumLiteral(r4EReviewTypeEEnum, R4EReviewType.R4E_REVIEW_TYPE_INFORMAL);
-		addEEnumLiteral(r4EReviewTypeEEnum, R4EReviewType.R4E_REVIEW_TYPE_FORMAL);
+		addEEnumLiteral(r4EReviewTypeEEnum, R4EReviewType.BASIC);
+		addEEnumLiteral(r4EReviewTypeEEnum, R4EReviewType.INFORMAL);
+		addEEnumLiteral(r4EReviewTypeEEnum, R4EReviewType.FORMAL);
 
 		initEEnum(r4EContextTypeEEnum, R4EContextType.class, "R4EContextType");
-		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.R4E_UNDEFINED);
-		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.R4E_ADDED);
-		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.R4E_DELETED);
-		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.R4E_MODIFIED);
-		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.R4E_REPLACED);
+		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.UNDEFINED);
+		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.ADDED);
+		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.DELETED);
+		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.MODIFIED);
+		addEEnumLiteral(r4EContextTypeEEnum, R4EContextType.REPLACED);
 
 		// Initialize data types
 		initEDataType(iResourceEDataType, IResource.class, "IResource", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/Persistence.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/Persistence.java
index 358d8181..6cb0bda9 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/Persistence.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/Persistence.java
@@ -43,6 +43,9 @@ import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleCollection;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
+import org.eclipse.mylyn.reviews.r4e.core.model.drules.impl.R4EDesignRuleCollectionImpl;
+import org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewGroupImpl;
+import org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
@@ -55,12 +58,26 @@ public interface Persistence {
 	// Constants
 	// ------------------------------------------------------------------------
 	public enum Roots {
-		GROUP("Group", "0.8.0"), REVIEW("Review", "0.12.0"), RULESET("RuleSet", "0.8.0");
+		GROUP("Group", "2.0.0"), REVIEW("Review", "2.0.0"), RULESET("RuleSet", "2.0.0");
 
 		private final String fName;
 
 		private final String fVersion;
 
+		/**
+		 * Note: the version number is not necessarily the most current version of the App, but the lowest app version
+		 * number for which models of the current version are compatible. In other words, this number should not be
+		 * bumped unless there is an actual <em>model</em> version change, and this number should always be in Sync with
+		 * the appropriate Roots, e.g.:
+		 * 
+		 * @link {@link R4EReviewImpl#FRAGMENT_VERSION_EDEFAULT}
+		 * @link {@link R4EDesignRuleCollectionImpl#FRAGMENT_VERSION_EDEFAULT}
+		 * @link {@link R4EReviewGroupImpl#FRAGMENT_VERSION_EDEFAULT}
+		 * @param aName
+		 *            An identifier
+		 * @param aVersion
+		 *            The lowest compatible version.
+		 */
 		Roots(String aName, String aVersion) {
 			fName = aName;
 			fVersion = aVersion;
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/impl/RModelFactoryExtImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/impl/RModelFactoryExtImpl.java
index 4a5306cb..09ef4416 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/impl/RModelFactoryExtImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/serial/impl/RModelFactoryExtImpl.java
@@ -17,16 +17,14 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
 import org.eclipse.mylyn.reviews.r4e.core.Activator;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
@@ -89,8 +87,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.GroupResFactory#createR4EReviewGroup(org.eclipse.
-	 * emf.common.util.URI, java.lang.String)
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.GroupResFactory
+	 * #createR4EReviewGroup(org.eclipse. emf.common.util.URI, java.lang.String)
 	 */
 	public R4EReviewGroup createR4EReviewGroup(URI aFolderPath, String aGroupName) throws ResourceHandlingException {
 
@@ -98,7 +96,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		// create a new ResourceSet and resource for the given group
 		Resource resource = fWriter.createResourceSetWithResource(fileGroupURI);
 		R4EReviewGroup group = RModelFactory.eINSTANCE.createR4EReviewGroup();
-		// Set the revision level fragment and sub model version start at the same level
+		// Set the revision level fragment and sub model version start at the
+		// same level
 		group.setFragmentVersion(Roots.GROUP.getVersion());
 		resource.getContents().add(group);
 
@@ -136,8 +135,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.GroupResFactory#openR4EReviewGroup(org.eclipse.emf
-	 * .common.util.URI)
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.GroupResFactory
+	 * #openR4EReviewGroup(org.eclipse.emf .common.util.URI)
 	 */
 	public R4EReviewGroup openR4EReviewGroup(URI aResourcePath) throws ResourceHandlingException,
 			CompatibilityException {
@@ -147,7 +146,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		String fragmentVersion = group.getFragmentVersion();
 		String appVersionLevel = Roots.GROUP.getVersion();
 
-		// validate if the group just opened is compatible with the current application
+		// validate if the group just opened is compatible with the current
+		// application
 		validateCompatibility(Roots.GROUP, group.getName(), fragmentVersion, appVersionLevel, group);
 
 		// Load resources from all participants
@@ -165,9 +165,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		}
 
 		// Build the mapping references to anomaly types
-		EList<R4EAnomalyType> anomTypes = group.getAvailableAnomalyTypes();
-		for (Iterator<R4EAnomalyType> iterator = anomTypes.iterator(); iterator.hasNext();) {
-			R4EAnomalyType r4eAnomalyType = iterator.next();
+		List<R4EAnomalyType> anomTypes = group.getAvailableAnomalyTypes();
+		for (R4EAnomalyType r4eAnomalyType : anomTypes) {
 			group.getAnomalyTypeKeyToReference().put(r4eAnomalyType.getType(), r4eAnomalyType);
 		}
 
@@ -189,7 +188,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	}
 
 	private void validateCompatibility(Roots aRoot, String aName, String aFragmentVersionInDisk,
-			String appVersionLevel, SubModelRoot root) throws CompatibilityException {
+			String appVersionLevel, IModelVersioning root) throws CompatibilityException {
 		int compatibility = VersionUtils.compareVersions(appVersionLevel, aFragmentVersionInDisk);
 		if (compatibility < 0) {
 			// Not able to continue, not forward compatible
@@ -202,7 +201,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 				closeR4EDesignRuleCollection((R4EDesignRuleCollection) root);
 			}
 
-			// Attempting to load a serialised model with a higher model version than the current one supported by the
+			// Attempting to load a serialised model with a higher model version
+			// than the current one supported by the
 			// application
 			StringBuilder sb = new StringBuilder("The " + aRoot.getName() + " \"" + aName
 					+ "\" is using a newer data format, please upgrade the application to the latest version");
@@ -230,7 +230,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 
 		// keep reference to all userReviews within group
 		group.getUserReviews().put(usrReviews.getName(), usrReviews);
-		EList<String> reviewNames = usrReviews.getCreatedReviews();
+		List<String> reviewNames = usrReviews.getCreatedReviews();
 		// Add enabled reviews to overall review map
 		for (String revName : reviewNames) {
 			R4EReview review = usrReviews.getInvitedToMap().get(revName);
@@ -245,7 +245,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.GroupResFactory#closeR4EReviewGroup(org.eclipse.mylyn
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.GroupResFactory
+	 * #closeR4EReviewGroup(org.eclipse.mylyn
 	 * .reviews.r4e.core.model.R4EReviewGroup)
 	 */
 	public String closeR4EReviewGroup(R4EReviewGroup aReviewGroup) {
@@ -266,7 +267,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 			return sb.toString();
 		}
 
-		EList<Resource> resList = resSet.getResources();
+		List<Resource> resList = resSet.getResources();
 
 		// unload then all
 		for (Resource res : resList) {
@@ -282,8 +283,10 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory#createR4EReview(org.eclipse.mylyn
-	 * .reviews.r4e.core.model.R4EReviewGroup, java.lang.String, java.lang.String)
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory
+	 * #createR4EReview(org.eclipse.mylyn
+	 * .reviews.r4e.core.model.R4EReviewGroup, java.lang.String,
+	 * java.lang.String)
 	 */
 	public R4EReview createR4EReview(R4EReviewGroup aReviewGroup, String aReviewName, String aCreatedByUser)
 			throws ResourceHandlingException {
@@ -311,9 +314,13 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		Resource groupResource = createReviewInputCheck(aReviewGroup, aReviewName);
 		ResourceSet resSet = groupResource.getResourceSet();
 		URI groupFilePath = groupResource.getURI();
-		groupFilePath = ResourceUtils.getFolderPath(groupFilePath); /* To directory */
+		groupFilePath = ResourceUtils.getFolderPath(groupFilePath); /*
+																	 * To
+																	 * directory
+																	 */
 
-		// Set the revision level for the fragment and track the current one for the application
+		// Set the revision level for the fragment and track the current one for
+		// the application
 		review.setFragmentVersion(Roots.REVIEW.getVersion());
 
 		// Associate review to a resource
@@ -322,26 +329,27 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		Resource reviewResource = resSet.createResource(reviewURI);
 		reviewResource.getContents().add(review);
 
-		// UPDATE TRANSIENT REFERENCES WITH GROUP, USER GROUP, REVIEW AND PARTICIPANT
+		// UPDATE TRANSIENT REFERENCES WITH GROUP, USER GROUP, REVIEW AND
+		// PARTICIPANT
 		aReviewGroup.getReviewsMap().put(aReviewName, review);
 		aReviewGroup.getReviews().add(review);
 
 		// CREATE PARTICIPANT resource and save it under the review folder
 		// create the participant default roles
 		List<R4EUserRole> role = new ArrayList<R4EUserRole>();
-		role.add(R4EUserRole.R4E_ROLE_ORGANIZER);
-		role.add(R4EUserRole.R4E_ROLE_LEAD);
+		role.add(R4EUserRole.ORGANIZER);
+		role.add(R4EUserRole.LEAD);
 		R4EParticipant participant = (R4EParticipant) createR4EUser(review, aCreatedByUser, role, true);
 
 		// Update pending associations to Review
 		Date now = new Date(new Date().getTime());
 		R4EReviewState state = RModelFactory.eINSTANCE.createR4EReviewState();
-		state.setState(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED);
+		state.setState(R4EReviewPhase.STARTED);
 		review.setCreatedBy(participant);
 		review.setStartDate(now);
 		review.getUsersMap().put(participant.getId(), participant);
 		review.setState(state);
-		review.setType(R4EReviewType.R4E_REVIEW_TYPE_BASIC);
+		review.setType(R4EReviewType.BASIC);
 
 		// SAVE REVIEW
 		fWriter.saveResource(reviewResource);
@@ -351,8 +359,10 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory#createR4EFormalReview(org.eclipse
-	 * .mylyn.reviews.r4e.core.model.R4EReviewGroup, java.lang.String, java.lang.String)
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory
+	 * #createR4EFormalReview(org.eclipse
+	 * .mylyn.reviews.r4e.core.model.R4EReviewGroup, java.lang.String,
+	 * java.lang.String)
 	 */
 	public R4EFormalReview createR4EFormalReview(R4EReviewGroup aReviewGroup, String aReviewName, String aCreatedByUser)
 			throws ResourceHandlingException {
@@ -371,7 +381,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory#createR4EReviewPhaseInfo(org.eclipse
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory
+	 * #createR4EReviewPhaseInfo(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EFormalReview)
 	 */
 	public R4EReviewPhaseInfo createR4EReviewPhaseInfo(R4EFormalReview aReview) throws ResourceHandlingException {
@@ -394,7 +405,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory#createR4EMeetingData(org.eclipse
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory
+	 * #createR4EMeetingData(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EReview)
 	 */
 	public R4EMeetingData createR4EMeetingData(R4EReview aReview) throws ResourceHandlingException {
@@ -452,7 +464,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		Resource ureviewsRes = null;
 		if (uReviews == null) {
 			uReviews = RModelFactory.eINSTANCE.createR4EUserReviews();
-			//create a user URI
+			// create a user URI
 			URI uri = defineParticipantResURI(aCreatedByUser, groupFilePath);
 
 			ureviewsRes = resSet.createResource(uri);
@@ -465,7 +477,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		}
 
 		uReviews.setGroup(aReviewGroup);
-		EList<String> reviewList = uReviews.getCreatedReviews();
+		List<String> reviewList = uReviews.getCreatedReviews();
 		if (!(reviewList.contains(review.getName())) && participant.isReviewCreatedByMe()) {
 			reviewList.add(review.getName());
 		}
@@ -504,7 +516,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 			return null;
 		}
 
-		// when the review is closed the element is marked as proxy and it's ready to be reloaded upon request.
+		// when the review is closed the element is marked as proxy and it's
+		// ready to be reloaded upon request.
 		R4EReview review = aReviewGroup.getReviewsMap().get(aReviewName);
 		if (review == null) {
 			StringBuilder sb = new StringBuilder("Not able to find Review: " + aReviewName + "\tin group: "
@@ -521,7 +534,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		// read review meta-data version from the loaded review
 		String fragmentVersion = review.getFragmentVersion();
 		String appVersionLevel = Roots.REVIEW.getVersion();
-		// Validate compatibility of the review data just loaded against the current version level of the application
+		// Validate compatibility of the review data just loaded against the
+		// current version level of the application
 		validateCompatibility(Roots.REVIEW, review.getName(), fragmentVersion, appVersionLevel, review);
 
 		URI folder = ResourceUtils.getFolderPath(review.eResource().getURI());
@@ -532,7 +546,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 				loadUsrData(review, uri);
 			}
 		} catch (ResourceHandlingException e) {
-			//try to close the partly opened review
+			// try to close the partly opened review
 			closeR4EReview(review);
 			throw e;
 		}
@@ -568,10 +582,10 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 
 		review.getUsersMap().put(participant.getId(), participant);
 		// update refs to comments and particpant
-		EList<R4EComment> comments = participant.getAddedComments();
+		List<R4EComment> comments = participant.getAddedComments();
 		if (comments != null) {
 			for (R4EComment comment : comments) {
-				review.getIdsMap().put(comment.getId(), comment);
+				review.getIdsMap().put(comment.getR4eId(), comment);
 				if (comment instanceof R4EAnomaly) {
 					review.getTopics().add((R4EAnomaly) comment);
 				} else {
@@ -584,7 +598,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		}
 
 		// update refs to items
-		EList<R4EItem> items = participant.getAddedItems();
+		List<R4EItem> items = participant.getAddedItems();
 		if (items != null && items.size() > 0) {
 			R4EItem anItem = items.get(0);
 
@@ -593,20 +607,18 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 
 			// Get: Items
 			for (R4EItem item : items) {
-				EMap<R4EID, R4EIDComponent> idsMap = review.getIdsMap();
-				idsMap.put(item.getId(), item);
-				review.getReviewItems().add(item);
+				Map<R4EID, R4EIDComponent> idsMap = review.getIdsMap();
+				idsMap.put(item.getR4eId(), item);
+				review.getItems().add(item);
 
 				// Get: file contexts
-				EList<R4EFileContext> fileCtxt = item.getFileContextList();
-				for (Iterator<R4EFileContext> iterator = fileCtxt.iterator(); iterator.hasNext();) {
-					R4EFileContext r4eFileContext = iterator.next();
-					idsMap.put(r4eFileContext.getId(), r4eFileContext);
+				List<R4EFileContext> fileCtxt = item.getFileContextList();
+				for (R4EFileContext r4eFileContext : fileCtxt) {
+					idsMap.put(r4eFileContext.getR4eId(), r4eFileContext);
 					// Get: Deltas
-					EList<R4EDelta> deltas = r4eFileContext.getDeltas();
-					for (Iterator<R4EDelta> iterator2 = deltas.iterator(); iterator2.hasNext();) {
-						R4EDelta delta = iterator2.next();
-						idsMap.put(delta.getId(), delta);
+					List<R4EDelta> deltas = r4eFileContext.getDeltas();
+					for (R4EDelta delta : deltas) {
+						idsMap.put(delta.getR4eId(), delta);
 					}
 				}
 			}
@@ -617,8 +629,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory#closeR4EReview(org.eclipse.mylyn
-	 * .reviews.r4e.core.model.R4EReview)
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory
+	 * #closeR4EReview(org.eclipse.mylyn .reviews.r4e.core.model.R4EReview)
 	 */
 	public String closeR4EReview(R4EReview aReview) {
 		// Get all participants
@@ -626,18 +638,17 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		Collection<R4EUser> participants = aReview.getUsersMap().values();
 		if (participants != null) {
 			// Release resources associated to each participant
-			for (Iterator<R4EUser> iterator = participants.iterator(); iterator.hasNext();) {
-				R4EParticipant participant = (R4EParticipant) iterator.next();
+			for (R4EUser r4eUser : participants) {
+				R4EParticipant participant = (R4EParticipant) r4eUser;
 				resource = participant.eResource();
 				// participant + its comments
 				if (resource != null) {
 					resource.unload();
 				}
-				EList<R4EItem> items = participant.getAddedItems();
+				List<R4EItem> items = participant.getAddedItems();
 				if (items != null && items.size() > 0) {
 					// items per participant
-					for (Iterator<R4EItem> iterator2 = items.iterator(); iterator2.hasNext();) {
-						R4EItem r4eItem = iterator2.next();
+					for (R4EItem r4eItem : items) {
 						resource = r4eItem.eResource();
 						if (resource != null) {
 							resource.unload();
@@ -667,8 +678,9 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory#deleteR4EReview(org.eclipse.mylyn
-	 * .reviews.r4e.core.model.R4EReview, boolean)
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ReviewResFactory
+	 * #deleteR4EReview(org.eclipse.mylyn .reviews.r4e.core.model.R4EReview,
+	 * boolean)
 	 */
 	public String deleteR4EReview(R4EReview aReview, boolean aDeleteOnDisk) throws ResourceHandlingException {
 		StringBuilder sb = new StringBuilder();
@@ -688,17 +700,19 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		R4EReviewGroup group = (R4EReviewGroup) aReview.eContainer();
 		group.getReviewsMap().remove(reviewName);
 
-		// // TODO: This action would require to update each user reviews file, where permissions may be an issue. For
+		// // TODO: This action would require to update each user reviews file,
+		// where permissions may be an issue. For
 		// the
 		// // moment only mark the review as disabled and unload resources
 		// EMap<String, R4EUserReviews> usrReviews = group.getUserReviews();
 		// if (usrReviews != null && usrReviews.size() > 0) {
 		// Collection<R4EUserReviews> reviews = usrReviews.values();
-		// for (Iterator<R4EUserReviews> iterator = reviews.iterator(); iterator.hasNext();) {
+		// for (Iterator<R4EUserReviews> iterator = reviews.iterator();
+		// iterator.hasNext();) {
 		// R4EUserReviews r4eUserReviews = (R4EUserReviews) iterator.next();
 		//
 		// // created list
-		// EList<String> createdList = r4eUserReviews.getCreatedReviews();
+		// List<String> createdList = r4eUserReviews.getCreatedReviews();
 		// if (createdList != null && createdList.size() > 0) {
 		// createdList.remove(reviewName);
 		// }
@@ -730,8 +744,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * 
 	 * /* (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#createR4EItem(org.eclipse.mylyn
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#createR4EItem(org.eclipse.mylyn
 	 * .reviews.r4e.core.model.R4EParticipant)
 	 */
 	public R4EItem createR4EItem(R4EParticipant aParticipant) throws ResourceHandlingException {
@@ -757,11 +771,11 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		item.setAddedBy(aParticipant);
 		item.setAddedById(aParticipant.getId());
 		item.setReview(review);
-		item.setId(itemID);
+		item.setR4eId(itemID);
 
 		// update derived references to the review
 		review.getIdsMap().put(itemID, item);
-		review.getReviewItems().add(item);
+		review.getItems().add(item);
 
 		// Verify if an item already exists to append to the same resource
 		int addedItems = aParticipant.getAddedItems().size();
@@ -780,7 +794,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 			// crate item resource
 			URI usrURI = usrResource.getURI();
 			URI reviewFolderURI = ResourceUtils.getFolderPath(usrURI);
-			// create a uri for the new participant, the user is serialized within the comments resource
+			// create a uri for the new participant, the user is serialized
+			// within the comments resource
 			URI itemURI = fWriter.createResourceURI(aParticipant.getId(), reviewFolderURI, ResourceType.USER_ITEM);
 			// create a Resource for the Participant
 			itemResource = resSet.createResource(itemURI);
@@ -791,7 +806,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		// update resource
 		itemResource.getContents().add(item);
 
-		// Save persistence changes affecting the Participant and the actual items
+		// Save persistence changes affecting the Participant and the actual
+		// items
 		fWriter.saveResource(itemResource);
 		fWriter.saveResource(usrResource);
 
@@ -801,8 +817,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#deleteR4EItem(org.eclipse.mylyn
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#deleteR4EItem(org.eclipse.mylyn
 	 * .reviews.r4e.core.model.R4EItem, boolean)
 	 */
 	public void deleteR4EItem(R4EItem aItem, boolean aDeleteOnDisk) throws ResourceHandlingException {
@@ -816,22 +832,23 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		}
 
 		// TODO: To consider before implementing actual resource removal
-		// Removing other elements may have references to this item (e.g reviewed items)
-		// Removing all references may present reading and writing conflicts and file permissions issues, since the
+		// Removing other elements may have references to this item (e.g
+		// reviewed items)
+		// Removing all references may present reading and writing conflicts and
+		// file permissions issues, since the
 		// references may be across different users.
-		// removing items may cause reshuffle of the references between items, and cause incorrect references indexes on
+		// removing items may cause reshuffle of the references between items,
+		// and cause incorrect references indexes on
 		// EMF
 		// Disable the item itself
 		aItem.setEnabled(false);
 		// Disable all related deltas
-		EList<R4EFileContext> fileContextList = aItem.getFileContextList();
+		List<R4EFileContext> fileContextList = aItem.getFileContextList();
 		if (fileContextList != null && fileContextList.size() > 0) {
-			for (Iterator<R4EFileContext> iterator = fileContextList.iterator(); iterator.hasNext();) {
-				R4EFileContext fileContext = iterator.next();
-				EList<R4EDelta> deltas = fileContext.getDeltas();
+			for (R4EFileContext fileContext : fileContextList) {
+				List<R4EDelta> deltas = fileContext.getDeltas();
 				if (deltas != null && deltas.size() > 0) {
-					for (Iterator<R4EDelta> iterator2 = deltas.iterator(); iterator2.hasNext();) {
-						R4EDelta delta = iterator2.next();
+					for (R4EDelta delta : deltas) {
 						delta.setEnabled(false);
 					}
 				}
@@ -848,8 +865,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#createR4EFileContext(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#createR4EFileContext(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EItem)
 	 */
 	public R4EFileContext createR4EFileContext(R4EItem item) throws ResourceHandlingException {
@@ -872,7 +889,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		contextID.setUserID(user.getId());
 
 		// Associate new fileContext with ID
-		fileContext.setId(contextID);
+		fileContext.setR4eId(contextID);
 		// Register ID to idMap at the review level
 		user.getReviewInstance().getIdsMap().put(contextID, fileContext);
 
@@ -884,8 +901,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#createR4EBaseFileVersion(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#createR4EBaseFileVersion(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EFileContext)
 	 */
 	public R4EFileVersion createR4EBaseFileVersion(R4EFileContext context) throws ResourceHandlingException {
@@ -898,8 +915,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#createR4ETargetFileVersion(org
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#createR4ETargetFileVersion(org
 	 * .eclipse.mylyn.reviews.r4e.core.model.R4EFileContext)
 	 */
 	public R4EFileVersion createR4ETargetFileVersion(R4EFileContext context) throws ResourceHandlingException {
@@ -931,8 +948,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#createR4EDelta(org.eclipse.mylyn
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#createR4EDelta(org.eclipse.mylyn
 	 * .reviews.r4e.core.model.R4EFileContext)
 	 */
 	public R4EDelta createR4EDelta(R4EFileContext context) throws ResourceHandlingException {
@@ -960,7 +977,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		deltaID.setUserID(user.getId());
 
 		// Associate new delta to ID
-		delta.setId(deltaID);
+		delta.setR4eId(deltaID);
 		// Register ID to idMap at the review level
 		user.getReviewInstance().getIdsMap().put(deltaID, delta);
 		// Associate delta to the context resource
@@ -975,8 +992,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#deleteR4EDelta(org.eclipse.mylyn
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#deleteR4EDelta(org.eclipse.mylyn
 	 * .reviews.r4e.core.model.R4EDelta)
 	 */
 	public void deleteR4EDelta(R4EDelta delta) throws ResourceHandlingException {
@@ -995,8 +1012,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#createR4EBaseTextContent(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#createR4EBaseTextContent(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EDelta)
 	 */
 	public R4ETextContent createR4EBaseTextContent(R4EDelta delta) throws ResourceHandlingException {
@@ -1006,8 +1023,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#createR4ETargetTextContent(org
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#createR4ETargetTextContent(org
 	 * .eclipse.mylyn.reviews.r4e.core.model.R4EDelta)
 	 */
 	public R4ETextContent createR4ETargetTextContent(R4EDelta delta) throws ResourceHandlingException {
@@ -1042,8 +1059,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserItemResFactory#createR4ETextPosition(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserItemResFactory#createR4ETextPosition(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4ETextContent)
 	 */
 	public R4ETextPosition createR4ETextPosition(R4ETextContent content) throws ResourceHandlingException {
@@ -1070,9 +1087,10 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserCommentResFactory#createR4EParticipant(org.eclipse
-	 * .mylyn.reviews.r4e.core.model.R4EReview, java.lang.String, java.util.List)
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserCommentResFactory#createR4EParticipant(org.eclipse
+	 * .mylyn.reviews.r4e.core.model.R4EReview, java.lang.String,
+	 * java.util.List)
 	 */
 	public R4EParticipant createR4EParticipant(R4EReview aReview, String aParticipantId, List<R4EUserRole> aRoles)
 			throws ResourceHandlingException {
@@ -1116,16 +1134,16 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 			if (participant.eResource() == null) {
 				sb.append("A participant with the same Id already exist in unknown state: " + aUserId);
 				sb.append("/nClose and reopen review, to reset the state of the elements");
-				// participant exists but is not associated to a resource, e.g. unknown state of references
+				// participant exists but is not associated to a resource, e.g.
+				// unknown state of references
 				throw new ResourceHandlingException(sb.toString());
 			} else {
 				// user already exists
 				// update roles (in case there are new ones)
 				if (aRoles != null && participant instanceof R4EParticipant) {
 					R4EParticipant dParticipant = (R4EParticipant) participant;
-					EList<R4EUserRole> eRoles = dParticipant.getRoles();
-					for (Iterator<R4EUserRole> iterator = aRoles.iterator(); iterator.hasNext();) {
-						R4EUserRole role = iterator.next();
+					List<R4EUserRole> eRoles = dParticipant.getRoles();
+					for (R4EUserRole role : aRoles) {
 						if (!(eRoles.contains(role))) {
 							eRoles.add(role);
 						}
@@ -1163,7 +1181,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		}
 		participant.getGroupPaths().add(containerResource.getURI().toString());
 
-		// find the review file uri to create the resource for the new participant
+		// find the review file uri to create the resource for the new
+		// participant
 		URI folderPath = containerResource.getURI();
 		// convert to folder
 		folderPath = ResourceUtils.getFolderPath(folderPath);
@@ -1198,8 +1217,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 
 		// roles
 		if (aRoles != null && aRoles.size() > 0) {
-			for (Iterator<R4EUserRole> iterator = aRoles.iterator(); iterator.hasNext();) {
-				R4EUserRole r4eUserRole = iterator.next();
+			for (R4EUserRole r4eUserRole : aRoles) {
 				participant.getRoles().add(r4eUserRole);
 			}
 		}
@@ -1235,8 +1253,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserCommentResFactory#createR4EAnomaly(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserCommentResFactory#createR4EAnomaly(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EParticipant)
 	 */
 	public R4EAnomaly createR4EAnomaly(R4EParticipant aAnomalyCreator) throws ResourceHandlingException {
@@ -1267,9 +1285,10 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserCommentResFactory#createR4EComment(org.eclipse
-	 * .mylyn.reviews.r4e.core.model.R4EParticipant, org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly)
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserCommentResFactory#createR4EComment(org.eclipse
+	 * .mylyn.reviews.r4e.core.model.R4EParticipant,
+	 * org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly)
 	 */
 	public R4EComment createR4EComment(R4EParticipant aParticipant, R4EAnomaly aContainerAnomaly)
 			throws ResourceHandlingException {
@@ -1296,8 +1315,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserCommentResFactory#createR4ETextContent(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserCommentResFactory#createR4ETextContent(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EAnomaly)
 	 */
 	public R4ETextContent createR4ETextContent(R4EAnomaly anomaly) throws ResourceHandlingException {
@@ -1308,7 +1327,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		}
 
 		R4ETextContent txtContent = RModelFactoryExt.eINSTANCE.createR4ETextContent();
-		anomaly.getLocation().add(txtContent);
+		anomaly.getLocations().add(txtContent);
 
 		// Associate to Resource and save
 		anomaly.eResource().getContents().add(txtContent);
@@ -1337,8 +1356,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserCommentResFactory#createR4EFileVersion(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserCommentResFactory#createR4EFileVersion(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition)
 	 */
 	public R4EFileVersion createR4EFileVersion(R4EAnomalyTextPosition txtPosition) throws ResourceHandlingException {
@@ -1360,8 +1379,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserCommentResFactory#deleteR4EComment(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserCommentResFactory#deleteR4EComment(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EComment, boolean)
 	 */
 	public void deleteR4EComment(R4EComment aComment, boolean aDeleteOnDisk) throws ResourceHandlingException {
@@ -1382,8 +1401,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.UserCommentResFactory#deleteR4EAnomaly(org.eclipse
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.
+	 * UserCommentResFactory#deleteR4EAnomaly(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.R4EAnomaly, boolean)
 	 */
 	public void deleteR4EAnomaly(R4EAnomaly aAnomaly, boolean aDeleteOnDisk) throws ResourceHandlingException {
@@ -1397,14 +1416,14 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	private void updCommonCommentRefs(R4EParticipant aCommentCreator, R4EComment aComment) {
 		Date createdOn = new Date();
 		aCommentCreator.getAddedComments().add(aComment);
-		aComment.setUser(aCommentCreator);
+		aComment.setAuthor(aCommentCreator);
 		aComment.setCreatedOn(createdOn);
 
 		// Assign the unique id to the comment
 		R4EID id = RModelFactory.eINSTANCE.createR4EID();
 		id.setUserID(aCommentCreator.getId());
 		id.setSequenceID(aCommentCreator.getSequenceIDCounterNext());
-		aComment.setId(id);
+		aComment.setR4eId(id);
 
 		// update references from review
 		aCommentCreator.getReviewInstance().getIdsMap().put(id, aComment);
@@ -1413,8 +1432,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence#testWritePermissions(org.eclipse.emf.common.util.URI)
+	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence#
+	 * testWritePermissions(org.eclipse.emf.common.util.URI)
 	 */
 	public boolean testWritePermissions(URI aLocation) throws ResourceHandlingException {
 		if (aLocation == null) {
@@ -1436,7 +1455,9 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence#PollDirUpdates(org.eclipse.emf.ecore.EObject)
+	 * @see
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence#PollDirUpdates
+	 * (org.eclipse.emf.ecore.EObject)
 	 */
 	public List<Resource> pollDirUpdates(EObject atElementLoc) {
 		// TODO Implement me
@@ -1464,8 +1485,9 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory#createR4EDesignRuleCollection(org.eclipse
-	 * .emf.common.util.URI, java.lang.String)
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory
+	 * #createR4EDesignRuleCollection(org.eclipse .emf.common.util.URI,
+	 * java.lang.String)
 	 */
 	public R4EDesignRuleCollection createR4EDesignRuleCollection(URI aFolderPath, String aRuleCollectionName)
 			throws ResourceHandlingException {
@@ -1477,7 +1499,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		R4EDesignRuleCollection ruleSet = DRModelFactory.eINSTANCE.createR4EDesignRuleCollection();
 		resource.getContents().add(ruleSet);
 
-		// Set the revision level fragment and sub model version start at the same level
+		// Set the revision level fragment and sub model version start at the
+		// same level
 		ruleSet.setFragmentVersion(Roots.RULESET.getVersion());
 
 		// Update the resource
@@ -1494,8 +1517,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory#openR4EDesignRuleCollection(org.eclipse
-	 * .emf.common.util.URI)
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory
+	 * #openR4EDesignRuleCollection(org.eclipse .emf.common.util.URI)
 	 */
 	public R4EDesignRuleCollection openR4EDesignRuleCollection(URI aResourcePath) throws ResourceHandlingException,
 			CompatibilityException {
@@ -1509,7 +1532,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 		// read the rule set meta-data version just loaded
 		String fragmentVersion = ruleSet.getFragmentVersion();
 		String appVersionLevel = Roots.RULESET.getVersion();
-		// Validate compatibility of the rule set data just loaded against the current version level of the application
+		// Validate compatibility of the rule set data just loaded against the
+		// current version level of the application
 		validateCompatibility(Roots.RULESET, ruleSet.getName(), fragmentVersion, appVersionLevel, ruleSet);
 
 		return ruleSet;
@@ -1519,11 +1543,13 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory#closeR4EDesignRuleCollection(org.eclipse
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory
+	 * #closeR4EDesignRuleCollection(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.drules.R4EDesignRuleCollection)
 	 */
 	public String closeR4EDesignRuleCollection(R4EDesignRuleCollection aDesRuleCollection) {
-		// TODO: Make generic as closing a review group is currently fairly similar
+		// TODO: Make generic as closing a review group is currently fairly
+		// similar
 		StringBuilder sb = new StringBuilder();
 
 		// Obtain all resources
@@ -1540,7 +1566,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 			Activator.fTracer.traceDebug(sb.toString());
 			return sb.toString();
 		}
-		EList<Resource> resList = resSet.getResources();
+		List<Resource> resList = resSet.getResources();
 
 		for (Resource res : resList) {
 			res.unload();
@@ -1552,7 +1578,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory#createR4EDesignRuleArea(org.eclipse
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory
+	 * #createR4EDesignRuleArea(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.drules.R4EDesignRuleCollection)
 	 */
 	public R4EDesignRuleArea createR4EDesignRuleArea(R4EDesignRuleCollection aRuleCollection)
@@ -1582,7 +1609,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory#createR4EDesignRuleViolation(org.eclipse
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory
+	 * #createR4EDesignRuleViolation(org.eclipse
 	 * .mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea)
 	 */
 	public R4EDesignRuleViolation createR4EDesignRuleViolation(R4EDesignRuleArea aRuleArea)
@@ -1613,7 +1641,8 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory#createR4EDesignRule(org.eclipse.mylyn
+	 * org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.DRulesFactory
+	 * #createR4EDesignRule(org.eclipse.mylyn
 	 * .reviews.r4e.core.model.drules.R4EDesignRuleViolation)
 	 */
 	public R4EDesignRule createR4EDesignRule(R4EDesignRuleViolation aViolation) throws ResourceHandlingException {
@@ -1639,7 +1668,7 @@ public class RModelFactoryExtImpl implements Persistence.RModelFactoryExt {
 	}
 
 	public R4EReview copyR4EReview(URI origGroup, URI destGroup, String origReviewName, String destReviewName) {
-		//		Copier copier = new Copier();
+		// Copier copier = new Copier();
 
 		return null;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelAdapterFactory.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelAdapterFactory.java
index ccc9dc24..215a5cee 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelAdapterFactory.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelAdapterFactory.java
@@ -21,20 +21,20 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-import org.eclipse.mylyn.reviews.r4e.core.model.*;
+import org.eclipse.mylyn.reviews.core.model.IComment;
+import org.eclipse.mylyn.reviews.core.model.ICommentType;
+import org.eclipse.mylyn.reviews.core.model.ILocation;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.core.model.IReview;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewGroup;
+import org.eclipse.mylyn.reviews.core.model.IReviewItem;
+import org.eclipse.mylyn.reviews.core.model.IReviewState;
+import org.eclipse.mylyn.reviews.core.model.ITaskReference;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
+import org.eclipse.mylyn.reviews.core.model.IUser;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ECommentType;
@@ -46,12 +46,14 @@ import org.eclipse.mylyn.reviews.r4e.core.model.R4EFormalReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EID;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EItem;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EMeetingData;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewDecision;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhaseInfo;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ETaskReference;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ETextContent;
@@ -247,51 +249,51 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 				return createR4EMeetingDataAdapter();
 			}
 			@Override
-			public Adapter caseReviewComponent(ReviewComponent object) {
+			public Adapter caseReviewComponent(IReviewComponent object) {
 				return createReviewComponentAdapter();
 			}
 			@Override
-			public Adapter caseSubModelRoot(SubModelRoot object) {
-				return createSubModelRootAdapter();
+			public Adapter caseReviewGroup(IReviewGroup object) {
+				return createReviewGroupAdapter();
 			}
 			@Override
-			public Adapter caseReviewGroup(ReviewGroup object) {
-				return createReviewGroupAdapter();
+			public Adapter caseModelVersioning(IModelVersioning object) {
+				return createModelVersioningAdapter();
 			}
 			@Override
-			public Adapter caseReview(Review object) {
+			public Adapter caseReview(IReview object) {
 				return createReviewAdapter();
 			}
 			@Override
-			public Adapter caseComment(Comment object) {
+			public Adapter caseComment(IComment object) {
 				return createCommentAdapter();
 			}
 			@Override
-			public Adapter caseTopic(Topic object) {
+			public Adapter caseTopic(ITopic object) {
 				return createTopicAdapter();
 			}
 			@Override
-			public Adapter caseUser(User object) {
+			public Adapter caseUser(IUser object) {
 				return createUserAdapter();
 			}
 			@Override
-			public Adapter caseItem(Item object) {
-				return createItemAdapter();
+			public Adapter caseReviewItem(IReviewItem object) {
+				return createReviewItemAdapter();
 			}
 			@Override
-			public Adapter caseLocation(Location object) {
+			public Adapter caseLocation(ILocation object) {
 				return createLocationAdapter();
 			}
 			@Override
-			public Adapter caseCommentType(CommentType object) {
+			public Adapter caseCommentType(ICommentType object) {
 				return createCommentTypeAdapter();
 			}
 			@Override
-			public Adapter caseTaskReference(TaskReference object) {
+			public Adapter caseTaskReference(ITaskReference object) {
 				return createTaskReferenceAdapter();
 			}
 			@Override
-			public Adapter caseReviewState(ReviewState object) {
+			public Adapter caseReviewState(IReviewState object) {
 				return createReviewStateAdapter();
 			}
 			@Override
@@ -761,12 +763,12 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent <em>Review Component</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IReviewComponent <em>Review Component</em>}'.
 	 * <!-- begin-user-doc --> This default implementation returns null so that we can
 	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
 	 * end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent
+	 * @see org.eclipse.mylyn.reviews.core.model.IReviewComponent
 	 * @generated
 	 */
 	public Adapter createReviewComponentAdapter() {
@@ -774,39 +776,38 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot
-	 * <em>Sub Model Root</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IReviewGroup
+	 * <em>Review Group</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
 	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot
+	 * @see org.eclipse.mylyn.reviews.core.model.IReviewGroup
 	 * @generated
 	 */
-	public Adapter createSubModelRootAdapter() {
+	public Adapter createReviewGroupAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup
-	 * <em>Review Group</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
-	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
-	 * -->
-	 * 
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IModelVersioning <em>Model Versioning</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can
+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+	 * end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup
+	 * @see org.eclipse.mylyn.reviews.core.model.IModelVersioning
 	 * @generated
 	 */
-	public Adapter createReviewGroupAdapter() {
+	public Adapter createModelVersioningAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Review <em>Review</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IReview <em>Review</em>}'.
 	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Review
+	 * @see org.eclipse.mylyn.reviews.core.model.IReview
 	 * @generated
 	 */
 	public Adapter createReviewAdapter() {
@@ -814,11 +815,11 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Comment <em>Comment</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IComment <em>Comment</em>}'.
 	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
 	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Comment
+	 * @see org.eclipse.mylyn.reviews.core.model.IComment
 	 * @generated
 	 */
 	public Adapter createCommentAdapter() {
@@ -826,11 +827,11 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Topic <em>Topic</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
-	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.ITopic <em>Topic</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's
+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Topic
+	 * @see org.eclipse.mylyn.reviews.core.model.ITopic
 	 * @generated
 	 */
 	public Adapter createTopicAdapter() {
@@ -838,11 +839,11 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.User <em>User</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
-	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IUser <em>User</em>}'.
+	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+	 * to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.User
+	 * @see org.eclipse.mylyn.reviews.core.model.IUser
 	 * @generated
 	 */
 	public Adapter createUserAdapter() {
@@ -850,25 +851,27 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Item <em>Item</em>}'.
-	 * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore
-	 * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IReviewItem
+	 * <em>Review Item</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
+	 * -->
+	 * 
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Item
+	 * @see org.eclipse.mylyn.reviews.core.model.IReviewItem
 	 * @generated
 	 */
-	public Adapter createItemAdapter() {
+	public Adapter createReviewItemAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.CommentType
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.ICommentType
 	 * <em>Comment Type</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
 	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.CommentType
+	 * @see org.eclipse.mylyn.reviews.core.model.ICommentType
 	 * @generated
 	 */
 	public Adapter createCommentTypeAdapter() {
@@ -876,13 +879,13 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.TaskReference
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.ITaskReference
 	 * <em>Task Reference</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
 	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.TaskReference
+	 * @see org.eclipse.mylyn.reviews.core.model.ITaskReference
 	 * @generated
 	 */
 	public Adapter createTaskReferenceAdapter() {
@@ -890,13 +893,13 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.ReviewState
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.IReviewState
 	 * <em>Review State</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
 	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.ReviewState
+	 * @see org.eclipse.mylyn.reviews.core.model.IReviewState
 	 * @generated
 	 */
 	public Adapter createReviewStateAdapter() {
@@ -904,13 +907,13 @@ public class RModelAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.frame.core.model.Location
+	 * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.ILocation
 	 * <em>Location</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
 	 * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @return the new adapter.
-	 * @see org.eclipse.mylyn.reviews.frame.core.model.Location
+	 * @see org.eclipse.mylyn.reviews.core.model.ILocation
 	 * @generated
 	 */
 	public Adapter createLocationAdapter() {
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResource.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResource.java
new file mode 100644
index 00000000..d9b9ec7d
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResource.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2010 Ericsson AB and others.
+ *  
+ * 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:
+ * Ericsson AB
+ */
+package org.eclipse.mylyn.reviews.r4e.core.model.util;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
+
+/**
+ * <!-- begin-user-doc --> The <b>Resource </b> associated with the package. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.mylyn.reviews.r4e.core.model.util.RModelResourceFactory
+ * @generated
+ */
+public class RModelResource extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @param uri
+	 *            the URI of the new resource.
+	 * @generated
+	 */
+	public RModelResource(URI uri) {
+		super(uri);
+	}
+
+} //RModelResource
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceFactory.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceFactory.java
new file mode 100644
index 00000000..77a9c127
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceFactory.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2010 Ericsson AB and others.
+ *  
+ * 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:
+ * Ericsson AB
+ */
+package org.eclipse.mylyn.reviews.r4e.core.model.util;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+/**
+ * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the package. <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.mylyn.reviews.r4e.core.model.util.RModelResource
+ * @generated
+ */
+public class RModelResourceFactory extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public RModelResourceFactory() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		XMLResource result = new RModelResource(uri);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
+		return result;
+	}
+
+} //RModelResourceFactory
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceFactoryImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceFactoryImpl.java
index b45107cf..c3b75de5 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceFactoryImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceFactoryImpl.java
@@ -15,11 +15,8 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
 import org.eclipse.emf.ecore.xmi.XMLResource;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceImpl.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceImpl.java
index 2f3798bd..f9a89c47 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelResourceImpl.java
@@ -15,7 +15,6 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelSwitch.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelSwitch.java
index 1cb13f0f..189c6f11 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelSwitch.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelSwitch.java
@@ -15,27 +15,25 @@
 package org.eclipse.mylyn.reviews.r4e.core.model.util;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.CommentType;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
-import org.eclipse.mylyn.reviews.frame.core.model.User;
-import org.eclipse.mylyn.reviews.r4e.core.model.*;
+import org.eclipse.mylyn.reviews.core.model.IComment;
+import org.eclipse.mylyn.reviews.core.model.ICommentType;
+import org.eclipse.mylyn.reviews.core.model.ILocation;
+import org.eclipse.mylyn.reviews.core.model.IModelVersioning;
+import org.eclipse.mylyn.reviews.core.model.IReview;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewGroup;
+import org.eclipse.mylyn.reviews.core.model.IReviewItem;
+import org.eclipse.mylyn.reviews.core.model.IReviewState;
+import org.eclipse.mylyn.reviews.core.model.ITaskReference;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
+import org.eclipse.mylyn.reviews.core.model.IUser;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ECommentType;
@@ -47,12 +45,14 @@ import org.eclipse.mylyn.reviews.r4e.core.model.R4EFormalReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EID;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EIDComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EItem;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EMeetingData;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewDecision;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
+import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhaseInfo;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ETaskReference;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ETextContent;
@@ -114,8 +114,8 @@ public class RModelSwitch<T> extends Switch<T> {
 				T result = caseR4EReviewGroup(r4EReviewGroup);
 				if (result == null) result = caseReviewGroup(r4EReviewGroup);
 				if (result == null) result = caseR4EReviewComponent(r4EReviewGroup);
+				if (result == null) result = caseModelVersioning(r4EReviewGroup);
 				if (result == null) result = caseReviewComponent(r4EReviewGroup);
-				if (result == null) result = caseSubModelRoot(r4EReviewGroup);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -124,8 +124,8 @@ public class RModelSwitch<T> extends Switch<T> {
 				T result = caseR4EReview(r4EReview);
 				if (result == null) result = caseReview(r4EReview);
 				if (result == null) result = caseR4EReviewComponent(r4EReview);
+				if (result == null) result = caseModelVersioning(r4EReview);
 				if (result == null) result = caseReviewComponent(r4EReview);
-				if (result == null) result = caseSubModelRoot(r4EReview);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -147,8 +147,8 @@ public class RModelSwitch<T> extends Switch<T> {
 				if (result == null) result = caseR4EReview(r4EFormalReview);
 				if (result == null) result = caseReview(r4EFormalReview);
 				if (result == null) result = caseR4EReviewComponent(r4EFormalReview);
+				if (result == null) result = caseModelVersioning(r4EFormalReview);
 				if (result == null) result = caseReviewComponent(r4EFormalReview);
-				if (result == null) result = caseSubModelRoot(r4EFormalReview);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -188,7 +188,7 @@ public class RModelSwitch<T> extends Switch<T> {
 				R4EItem r4EItem = (R4EItem)theEObject;
 				T result = caseR4EItem(r4EItem);
 				if (result == null) result = caseR4EIDComponent(r4EItem);
-				if (result == null) result = caseItem(r4EItem);
+				if (result == null) result = caseReviewItem(r4EItem);
 				if (result == null) result = caseR4EReviewComponent(r4EItem);
 				if (result == null) result = caseReviewComponent(r4EItem);
 				if (result == null) result = defaultCase(theEObject);
@@ -874,35 +874,35 @@ public class RModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReviewComponent(ReviewComponent object) {
+	public T caseReviewComponent(IReviewComponent object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sub Model Root</em>'. <!-- begin-user-doc
-	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
-	 * -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sub Model Root</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Review Group</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Review Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseSubModelRoot(SubModelRoot object) {
+	public T caseReviewGroup(IReviewGroup object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Review Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Review Group</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Model Versioning</em>'. <!-- begin-user-doc
+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
+	 * -->
+	 * 
+	 * @param object
+	 *            the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Model Versioning</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReviewGroup(ReviewGroup object) {
+	public T caseModelVersioning(IModelVersioning object) {
 		return null;
 	}
 
@@ -915,7 +915,7 @@ public class RModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReview(Review object) {
+	public T caseReview(IReview object) {
 		return null;
 	}
 
@@ -928,7 +928,7 @@ public class RModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseComment(Comment object) {
+	public T caseComment(IComment object) {
 		return null;
 	}
 
@@ -941,7 +941,7 @@ public class RModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseTopic(Topic object) {
+	public T caseTopic(ITopic object) {
 		return null;
 	}
 
@@ -954,20 +954,33 @@ public class RModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseUser(User object) {
+	public T caseUser(IUser object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Review Item</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Review Item</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseReviewItem(IReviewItem object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Item</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Location</em>'.
 	 * <!-- begin-user-doc --> This
 	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Item</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Location</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseItem(Item object) {
+	public T caseLocation(ILocation object) {
 		return null;
 	}
 
@@ -980,7 +993,7 @@ public class RModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseCommentType(CommentType object) {
+	public T caseCommentType(ICommentType object) {
 		return null;
 	}
 
@@ -995,7 +1008,7 @@ public class RModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseTaskReference(TaskReference object) {
+	public T caseTaskReference(ITaskReference object) {
 		return null;
 	}
 
@@ -1008,20 +1021,7 @@ public class RModelSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReviewState(ReviewState object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Location</em>'.
-	 * <!-- begin-user-doc --> This
-	 * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Location</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLocation(Location object) {
+	public T caseReviewState(IReviewState object) {
 		return null;
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelXMLProcessor.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelXMLProcessor.java
index e9df20f8..a777f13b 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelXMLProcessor.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/model/util/RModelXMLProcessor.java
@@ -17,11 +17,8 @@ package org.eclipse.mylyn.reviews.r4e.core.model.util;
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/utils/CommonModelFileConverter.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/utils/CommonModelFileConverter.java
new file mode 100644
index 00000000..4d88434c
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/utils/CommonModelFileConverter.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Tasktop Technologies and others.
+ * 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:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.reviews.r4e.core.utils;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+
+public class CommonModelFileConverter extends SimpleFileConverter {
+	static Replacement[] REPLACEMENTS = new Replacement[] {
+			new Replacement("R4E_ROLE_(\\s*)", "$1"), //$NON-NLS-1$ //$NON-NLS-2$
+			new Replacement("R4E_ANOMALY_STATE_(\\s*)", "$1"), new Replacement("R4E_REVIEW_PHASE_(\\s*)", "$1"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
+			new Replacement("R4E_REVIEW_DECISION_(\\s*)", "$1"), new Replacement("R4E_REVIEW_TYPE_(\\s*)", "$1"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			new Replacement("R4E_CLASS_(\\s*)", "$1"), new Replacement("R4E_RANK_(\\s*)", "$1"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			new Replacement("R4E_(\\s*)", "$1"), new Replacement("\\suser=\"", " author=\""), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+			new Replacement("<location\\sxsi", "<locations xsi"), new Replacement(" fragmentVersion=\\S*\"", ""), new Replacement("(<r4ecore:R4EReview.*\" )(name=\".*>)", "$1fragmentVersion=\"2\\.0\\.0\" $2") }; //$NON-NLS-1$ //$NON-NLS-2$
+
+	public CommonModelFileConverter(EObject object) {
+		super(object, "xrer", new String[] { "git" }, REPLACEMENTS); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public CommonModelFileConverter(URI uri) {
+		super(uri, "xrer", new String[] { "git" }, REPLACEMENTS); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	public static void main(String[] args) {
+		URI uri = URI.createFileURI(args[0]);
+		CommonModelFileConverter converter = new CommonModelFileConverter(uri);
+		converter.setUser(true);
+		converter.schedule();
+		while (converter.getResult() == null) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+		}
+		System.err.println(converter.getResult().getMessage());
+	}
+}
diff --git a/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/utils/SimpleFileConverter.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/utils/SimpleFileConverter.java
new file mode 100644
index 00000000..34165d72
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/utils/SimpleFileConverter.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (c) 2010, 2012 Ericsson
+ *  
+ * 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
+ * 
+ * Description:
+ * 
+ * Contributors:
+ * Miles Parker  - Initial implementation
+ * 
+ */
+
+package org.eclipse.mylyn.reviews.r4e.core.utils;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.mylyn.reviews.r4e.core.Activator;
+
+/**
+ * @author Miles Parker
+ */
+public abstract class SimpleFileConverter extends Job {
+
+	BufferedWriter logWriter;
+
+	int filesConverted;
+
+	int linesConverted;
+
+	private final String extension;
+
+	private Pattern[] patterns;
+
+	private final Replacement[] replacements;
+
+	private URI rootUri;
+
+	private final String[] ignoreExtension;
+
+	private IProgressMonitor monitor;
+
+	public static class Replacement {
+		String match;
+
+		String replace;
+
+		public Replacement(String match, String replace) {
+			super();
+			this.match = match;
+			this.replace = replace;
+		}
+	}
+
+	private SimpleFileConverter(String extension, String[] ignoreExtension, Replacement[] replacements) {
+		super("Convert " + extension + " files.");
+		this.extension = extension;
+		this.ignoreExtension = ignoreExtension;
+		this.replacements = replacements;
+	}
+
+	public SimpleFileConverter(EObject parent, String extension, String[] ignoreExtension, Replacement[] replacements) {
+		this(extension, ignoreExtension, replacements);
+		this.rootUri = parent.eResource().getURI().trimSegments(1);
+	}
+
+	public SimpleFileConverter(URI uri, String extension, String[] ignoreExtension, Replacement[] replacements) {
+		this(extension, ignoreExtension, replacements);
+		this.rootUri = uri;
+	}
+
+	@Override
+	protected IStatus run(IProgressMonitor monitor) {
+		this.monitor = monitor;
+		patterns = new Pattern[replacements.length];
+		for (int i = 0; i < patterns.length; i++) {
+			patterns[i] = Pattern.compile(replacements[i].match);
+		}
+		String folderPath = (rootUri.toFileString());
+		File file = new File(folderPath);
+		monitor.beginTask("Converting Files", count(file));
+		File logFile = new File(folderPath + File.separator + "conversion.log");
+		try {
+			logFile.createNewFile();
+			logWriter = new BufferedWriter(new FileWriter(logFile));
+			log("R4E Common Model Conversion Log: " + logFile.getAbsolutePath() + "\n\n");
+			log("Root Folder: " + folderPath);
+			convert(file);
+			logWriter.close();
+		} catch (IOException e) {
+			return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Couldn't convert model at URI: " + file, e);
+		}
+		return Status.OK_STATUS;
+	}
+
+	protected void convert(File file) throws FileNotFoundException, IOException {
+		Path path = new Path(file.getAbsolutePath());
+		if (!file.isDirectory() && path.getFileExtension() == null) {
+			return;
+		}
+		for (String ext : ignoreExtension) {
+			if (StringUtils.equals(ext, path.getFileExtension())) {
+				return;
+			}
+		}
+		if (file.exists()) {
+			if (file.isDirectory()) {
+				for (File member : file.listFiles()) {
+					convert(member);
+				}
+			} else {
+				if (path.getFileExtension() == null) {
+					return;
+				}
+				if (path.getFileExtension().equals(extension)) {
+					log("    " + file.getAbsolutePath());
+					filesConverted++;
+					BufferedReader br = new BufferedReader(new FileReader(file));
+					StringBuilder fileContents = new StringBuilder(8000);
+					int lineNum = 0;
+					while (br.ready()) {
+						String line = br.readLine();
+						String convert = convert(line);
+						fileContents.append(convert + "\n");
+						if (!line.equals(convert)) {
+							String lineNumString = StringUtils.leftPad(lineNum + "", 5);
+							log("      " + lineNumString + ":  " + line + "\n              " + convert);
+						}
+						lineNum++;
+					}
+					br.close();
+					BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+					writer.write(fileContents.toString());
+					writer.close();
+				}
+			}
+		}
+		monitor.worked(1);
+	}
+
+	protected int count(File file) {
+		int count = 0;
+		Path path = new Path(file.getAbsolutePath());
+		if (!file.isDirectory() && path.getFileExtension() == null) {
+			return 0;
+		}
+		for (String ext : ignoreExtension) {
+			if (StringUtils.equals(ext, path.getFileExtension())) {
+				return 0;
+			}
+		}
+		if (file.exists()) {
+			count++;
+			if (file.isDirectory()) {
+				for (File member : file.listFiles()) {
+					count += count(member);
+				}
+			}
+		}
+		return count;
+	}
+
+	private String convert(String line) {
+		String result = line;
+		for (int i = 0; i < patterns.length; i++) {
+			Matcher matcher = patterns[i].matcher(result);
+			result = matcher.replaceAll(replacements[i].replace);
+		}
+		return result;
+	}
+
+	private void log(String item) {
+		System.out.println(item);
+		try {
+			logWriter.write(item + "\n");
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+}
diff --git a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/utils/Tracer.java b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/utils/Tracer.java
index c2eac07a..d6f7c1ea 100644
--- a/org.eclipse.mylyn.reviews.frame.core/src/org/eclipse/mylyn/reviews/frame/core/utils/Tracer.java
+++ b/org.eclipse.mylyn.reviews.r4e.core/src/org/eclipse/mylyn/reviews/r4e/core/utils/Tracer.java
@@ -9,8 +9,7 @@
  *     Ericsson AB - initial API and implementation
  *******************************************************************************/
 
-
-package org.eclipse.mylyn.reviews.frame.core.utils;
+package org.eclipse.mylyn.reviews.r4e.core.utils;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;
@@ -20,14 +19,12 @@ import java.util.Date;
 
 import org.eclipse.core.runtime.Platform;
 
-
 // ESCA-JAVA0100:
 /**
- * This class implements a simple trace facility using Eclipse that can be used to send debugging
- * output to the console and/or to file.  It supports various levels of tracing
+ * This class implements a simple trace facility using Eclipse that can be used to send debugging output to the console
+ * and/or to file. It supports various levels of tracing
  * 
  * @author Sebastien Dubois
- * 
  */
 public class Tracer {
 
@@ -35,46 +32,50 @@ public class Tracer {
 	// Constants
 	// ------------------------------------------------------------------------
 
-    static final int DEFAULT_STACK_TRACE_ELEMENT = 3;
-	
-    
+	static final int DEFAULT_STACK_TRACE_ELEMENT = 3;
+
 	// ------------------------------------------------------------------------
 	// Member variables
 	// ------------------------------------------------------------------------
 
-    static boolean ERROR = false;
-    static boolean WARNING = false;
-    static boolean INFO = false;
-    static boolean DEBUG = false;
-    
-	private String fPluginID; 
-	private BufferedWriter	fTraceFile;
+	static boolean ERROR = false;
+
+	static boolean WARNING = false;
+
+	static boolean INFO = false;
+
+	static boolean DEBUG = false;
+
+	private String fPluginID;
+
+	private BufferedWriter fTraceFile;
+
 	private SimpleDateFormat fTimeFormat;
-	private StringBuilder	fTraceMessage;
-	private boolean			fLogToConsole;
 
-	
+	private StringBuilder fTraceMessage;
+
+	private boolean fLogToConsole;
+
 	// ------------------------------------------------------------------------
 	// Constructors
 	// ------------------------------------------------------------------------
-	
+
 	public Tracer() {
-		fTraceFile	= null;
+		fTraceFile = null;
 		fTimeFormat = new SimpleDateFormat("HH:mm:ss:SSS");
 		fTraceMessage = new StringBuilder();
 		fLogToConsole = true;
 	}
-	
-	
+
 	// ------------------------------------------------------------------------
 	// Methods
 	// ------------------------------------------------------------------------
-	
+
 	/**
 	 * Initialize the tracer object
 	 * 
-	 * @param aPluginId - the calling plugin ID (as a String object)
-	 * 
+	 * @param aPluginId
+	 *            - the calling plugin ID (as a String object)
 	 */
 	public void init(String aPluginId) {
 
@@ -86,27 +87,27 @@ public class Tracer {
 		if (traceKey != null) {
 			ERROR = (Boolean.valueOf(traceKey)).booleanValue();
 		}
-		
+
 		traceKey = Platform.getDebugOption(fPluginID + "/warning");
 		if (traceKey != null) {
 			WARNING = (Boolean.valueOf(traceKey)).booleanValue();
 		}
-		
+
 		traceKey = Platform.getDebugOption(fPluginID + "/info");
 		if (traceKey != null) {
 			INFO = (Boolean.valueOf(traceKey)).booleanValue();
 		}
-		
+
 		traceKey = Platform.getDebugOption(fPluginID + "/debug");
 		if (traceKey != null) {
 			DEBUG = (Boolean.valueOf(traceKey)).booleanValue();
-		}	
-		
+		}
+
 		traceKey = Platform.getDebugOption(fPluginID + "/consoleLog");
 		if (traceKey != null) {
 			fLogToConsole = (Boolean.valueOf(traceKey)).booleanValue();
-		}	
-		
+		}
+
 		traceKey = Platform.getDebugOption(fPluginID + "/logfile");
 		if (traceKey != null) {
 			try {
@@ -118,10 +119,8 @@ public class Tracer {
 		}
 	}
 
-	
 	/**
 	 * Close the trace output logfile (if used)
-	 * 
 	 */
 	public void closeLogfile() {
 		if (fTraceFile == null) {
@@ -136,7 +135,7 @@ public class Tracer {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * @param newValue
 	 * @return
@@ -146,7 +145,7 @@ public class Tracer {
 		ERROR = newValue;
 		return oldValue;
 	}
-	
+
 	/**
 	 * @param newValue
 	 * @return
@@ -167,7 +166,6 @@ public class Tracer {
 		return oldValue;
 	}
 
-
 	/**
 	 * @param newValue
 	 * @return
@@ -181,7 +179,7 @@ public class Tracer {
 	public static boolean isError() {
 		return ERROR;
 	}
-	
+
 	public static boolean isDebug() {
 		return DEBUG;
 	}
@@ -193,17 +191,17 @@ public class Tracer {
 	public static boolean isWarning() {
 		return WARNING;
 	}
-	
+
 	/**
 	 * Output an error trace
 	 * 
-	 * @param aMsg - the trace message to output
-	 * 
+	 * @param aMsg
+	 *            - the trace message to output
 	 */
 	public void traceError(String aMsg) {
 		if (ERROR) {
 			fTraceMessage.setLength(0);
-			//Timestamp
+			// Timestamp
 			writeTimestamp(fTraceMessage);
 			fTraceMessage.append(" E");
 			writeThread(fTraceMessage);
@@ -212,17 +210,17 @@ public class Tracer {
 			outputTrace(fTraceMessage);
 		}
 	}
-	
+
 	/**
 	 * Output a warning trace
 	 * 
-	 * @param aMsg - the trace message to output
-	 * 
+	 * @param aMsg
+	 *            - the trace message to output
 	 */
 	public void traceWarning(String aMsg) {
 		if (WARNING) {
 			fTraceMessage.setLength(0);
-			//Timestamp
+			// Timestamp
 			writeTimestamp(fTraceMessage);
 			fTraceMessage.append(" W");
 			writeThread(fTraceMessage);
@@ -231,17 +229,17 @@ public class Tracer {
 			outputTrace(fTraceMessage);
 		}
 	}
-	
+
 	/**
 	 * Output an info trace
 	 * 
-	 * @param aMsg - the trace message to output
-	 * 
+	 * @param aMsg
+	 *            - the trace message to output
 	 */
 	public void traceInfo(String aMsg) {
 		if (INFO) {
 			fTraceMessage.setLength(0);
-			//Timestamp
+			// Timestamp
 			writeTimestamp(fTraceMessage);
 			fTraceMessage.append(" I");
 			writeThread(fTraceMessage);
@@ -250,17 +248,17 @@ public class Tracer {
 			outputTrace(fTraceMessage);
 		}
 	}
-	
+
 	/**
 	 * Output a debug trace
 	 * 
-	 * @param aMsg - the trace message to output
-	 * 
+	 * @param aMsg
+	 *            - the trace message to output
 	 */
 	public void traceDebug(String aMsg) {
 		if (DEBUG) {
 			fTraceMessage.setLength(0);
-			//Timestamp
+			// Timestamp
 			writeTimestamp(fTraceMessage);
 			fTraceMessage.append(" D");
 			writeThread(fTraceMessage);
@@ -269,35 +267,32 @@ public class Tracer {
 			outputTrace(fTraceMessage);
 		}
 	}
-	
-	
+
 	/**
 	 * Write timestamp header
 	 * 
-	 * @param aSb - the StringBuilder object (trace line) to append to
-	 * 
+	 * @param aSb
+	 *            - the StringBuilder object (trace line) to append to
 	 */
 	private void writeTimestamp(StringBuilder aSb) {
 		aSb.append("[" + fTimeFormat.format(new Date()) + "]");
 	}
-	
-	
+
 	/**
 	 * Write thread header
 	 * 
-	 * @param aSb - the StringBuilder object (trace line) to append to
-	 * 
+	 * @param aSb
+	 *            - the StringBuilder object (trace line) to append to
 	 */
 	private static void writeThread(StringBuilder aSb) {
 		aSb.append(" T=" + Thread.currentThread().getName());
 	}
-	
-	
+
 	/**
 	 * Write location header
 	 * 
-	 * @param aSb - the StringBuilder object (trace line) to append to
-	 * 
+	 * @param aSb
+	 *            - the StringBuilder object (trace line) to append to
 	 */
 	private static void writeLocation(StringBuilder aSb) {
 		int traceElement = DEFAULT_STACK_TRACE_ELEMENT;
@@ -316,21 +311,20 @@ public class Tracer {
 			}
 		}
 	}
-	
-	
+
 	/**
 	 * Write trace to console/file
 	 * 
-	 * @param aSb - the StringBuilder object (trace line) to output
-	 * 
+	 * @param aSb
+	 *            - the StringBuilder object (trace line) to output
 	 */
 	private void outputTrace(StringBuilder aSb) {
-		
+
 		if (fLogToConsole) {
 			// ESCA-JAVA0266:
 			System.out.println(aSb);
 		}
-		
+
 		if (fTraceFile != null) {
 			try {
 				fTraceFile.write(aSb.toString());
@@ -342,6 +336,5 @@ public class Tracer {
 			}
 		}
 	}
-	
-}
 
+}
diff --git a/org.eclipse.mylyn.reviews.r4e.feature/feature.xml b/org.eclipse.mylyn.reviews.r4e.feature/feature.xml
index e8a12c54..f0319855 100644
--- a/org.eclipse.mylyn.reviews.r4e.feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.r4e.feature/feature.xml
@@ -27,40 +27,14 @@
    <license url="license.html">
       %license
    </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jgit" version="0.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.compare" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.team.ui" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.egit.core" version="0.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.team.core" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylyn.reviews.frame.core" version="0.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylyn.reviews.r4e.core" version="0.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylyn.versions.core" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylyn.versions.ui" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylyn.reviews.notifications" version="0.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylyn.commons.core" version="3.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.mylyn.reviews.VCalendar" version="0.10.0" match="greaterOrEqual"/>
-      <import plugin="javax.activation" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="javax.mail" version="1.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import feature="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
-      <import feature="org.eclipse.egit" version="1.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.mylyn.versions" version="0.9.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.mylyn.commons" version="3.7.0" match="compatible"/>
-   </requires>
-
+   
+   <requires>		
+		<import feature="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>		
+		<import feature="org.eclipse.egit" version="1.0.0" match="greaterOrEqual"/>		
+		<import feature="org.eclipse.mylyn.versions" version="1.1.0" match="greaterOrEqual"/>		
+		<import feature="org.eclipse.mylyn.commons" version="3.7.0" match="compatible"/>		
+	</requires>
+		
    <plugin
          id="org.eclipse.mylyn.reviews.r4e.core"
          download-size="0"
@@ -82,13 +56,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.mylyn.reviews.frame.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.mylyn.reviews.ldap"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.mylyn.reviews.r4e.ldap/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.ldap/META-INF/MANIFEST.MF
index 354bcc19..bd5a0aea 100644
--- a/org.eclipse.mylyn.reviews.r4e.ldap/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.ldap/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Activator: org.eclipse.mylyn.reviews.ldap.LdapPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.mylyn.reviews.frame.core;bundle-version="0.10.0"
+ org.eclipse.mylyn.reviews.core;bundle-version="1.1.0",
+ org.eclipse.mylyn.reviews.r4e.core;bundle-version="0.13.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.mylyn.reviews.r4e.ldap/src/org/eclipse/mylyn/reviews/ldap/LdapPlugin.java b/org.eclipse.mylyn.reviews.r4e.ldap/src/org/eclipse/mylyn/reviews/ldap/LdapPlugin.java
index dfa9e938..99aa8864 100644
--- a/org.eclipse.mylyn.reviews.r4e.ldap/src/org/eclipse/mylyn/reviews/ldap/LdapPlugin.java
+++ b/org.eclipse.mylyn.reviews.r4e.ldap/src/org/eclipse/mylyn/reviews/ldap/LdapPlugin.java
@@ -16,7 +16,7 @@ package org.eclipse.mylyn.reviews.ldap;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
diff --git a/org.eclipse.mylyn.reviews.r4e.report/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.report/META-INF/MANIFEST.MF
index 92b29810..2101bafa 100644
--- a/org.eclipse.mylyn.reviews.r4e.report/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.report/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ Require-Bundle: org.eclipse.birt.report.engine,
  org.eclipse.core.filesystem,
  org.eclipse.ui.ide,
  org.eclipse.ui.editors,
- org.eclipse.mylyn.reviews.frame.core;bundle-version="0.10.0",
  org.eclipse.ui,
  org.eclipse.mylyn.reviews.r4e.transform;bundle-version="0.10.0",
  org.eclipse.mylyn.reviews.r4e.core;bundle-version="0.10.0",
- org.eclipse.emf.ecore;bundle-version="2.5.0"
+ org.eclipse.emf.ecore;bundle-version="2.5.0",
+ org.eclipse.mylyn.reviews.core;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/Activator.java b/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/Activator.java
index d12a5f09..d776660c 100644
--- a/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/Activator.java
+++ b/org.eclipse.mylyn.reviews.r4e.report/src/org/eclipse/mylyn/reviews/r4e/report/internal/Activator.java
@@ -16,7 +16,7 @@ package org.eclipse.mylyn.reviews.r4e.report.internal;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
diff --git a/org.eclipse.mylyn.reviews.r4e.reports-feature/feature.xml b/org.eclipse.mylyn.reviews.r4e.reports-feature/feature.xml
index ded01cf4..d2d28d9c 100644
--- a/org.eclipse.mylyn.reviews.r4e.reports-feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.r4e.reports-feature/feature.xml
@@ -27,19 +27,9 @@
    <license url="license.html">
       %license
    </license>
-
+   
    <requires>
-      <import plugin="org.eclipse.birt.report.engine"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.mylyn.reviews.frame.core" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.mylyn.reviews.r4e.core" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.mylyn.reviews.r4e.feature" version="0.9.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.mylyn.reviews.r4e.feature" version="0.13.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.birt" version="2.6.2" match="greaterOrEqual"/>
    </requires>
 
diff --git a/org.eclipse.mylyn.reviews.r4e.sdk.feature/feature.xml b/org.eclipse.mylyn.reviews.r4e.sdk.feature/feature.xml
index 02ea5bf6..788c7b79 100644
--- a/org.eclipse.mylyn.reviews.r4e.sdk.feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.r4e.sdk.feature/feature.xml
@@ -53,13 +53,6 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-   <plugin
-         id="org.eclipse.mylyn.reviews.frame.core.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
    <plugin
          id="org.eclipse.mylyn.reviews.notifications.source"
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.transform/META-INF/MANIFEST.MF
index 420c6aa0..249c2486 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.transform/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.mylyn.reviews.r4e.core;bundle-version="0.10.0",
- org.eclipse.mylyn.reviews.frame.core;bundle-version="0.10.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
- org.eclipse.core.runtime;bundle-version="3.5.0"
+Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.mylyn.reviews.core;bundle-version="1.1.0",
+ org.eclipse.mylyn.reviews.r4e.core;bundle-version="0.13.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.mylyn.reviews.r4e.internal.transform.Activator
 Export-Package: org.eclipse.mylyn.reviews.r4e.internal.transform;x-friends="org.eclipse.mylyn.reviews.r4e.core.tests,org.eclipse.mylyn.reviews.r4e.report",
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/Activator.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/Activator.java
index 10e985ed..60ce72d1 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/Activator.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/Activator.java
@@ -15,7 +15,7 @@ package org.eclipse.mylyn.reviews.r4e.internal.transform;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 import org.osgi.framework.BundleContext;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/impl/ModelTransformImpl.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/impl/ModelTransformImpl.java
index aa5a215c..103cc500 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/impl/ModelTransformImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/impl/ModelTransformImpl.java
@@ -13,16 +13,16 @@ package org.eclipse.mylyn.reviews.r4e.internal.transform.impl;
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewState;
-import org.eclipse.mylyn.reviews.frame.core.model.TaskReference;
+import org.eclipse.mylyn.reviews.internal.core.model.ReviewState;
+import org.eclipse.mylyn.reviews.internal.core.model.TaskReference;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
@@ -86,7 +86,7 @@ public class ModelTransformImpl implements ModelTransform {
 		ReviewGroupRes group = fReader.deserializeTopElement(aResourcePath, ReviewGroupRes.class);
 
 		// Build the mapping references to anomaly types
-		EList<R4EAnomalyType> anomTypes = group.getAvailableAnomalyTypes();
+		List<R4EAnomalyType> anomTypes = group.getAvailableAnomalyTypes();
 		for (R4EAnomalyType r4eAnomalyType : anomTypes) {
 			group.getAnomalyTypeKeyToReference().put(r4eAnomalyType.getType(), r4eAnomalyType);
 		}
@@ -117,7 +117,7 @@ public class ModelTransformImpl implements ModelTransform {
 			return sb.toString();
 		}
 
-		EList<Resource> resList = resSet.getResources();
+		List<Resource> resList = resSet.getResources();
 
 		// unload then all
 		for (Resource res : resList) {
@@ -149,7 +149,7 @@ public class ModelTransformImpl implements ModelTransform {
 		String filePrefix = destGroup.getFilesPrefix();
 
 		//Make sure a review with this name does not already exists
-		EList<ReviewRes> existingReviews = destGroup.getReviewsRes();
+		List<ReviewRes> existingReviews = destGroup.getReviewsRes();
 		for (Object element : existingReviews) {
 			ReviewRes reviewRes = (ReviewRes) element;
 			if (reviewRes.getName().equals(aOigReviewName)) {
@@ -193,7 +193,7 @@ public class ModelTransformImpl implements ModelTransform {
 
 		Resource destResource = destReview.eResource();
 		R4EUser createdBy = origReview.getCreatedBy();
-		EList<R4EUser> users = destReview.getUsersRes();
+		List<R4EUser> users = destReview.getUsersRes();
 		//clone all users to new destination resource, this will make sure that back reference from children to any user will point to the updated resource
 		for (R4EUser oUser : origUsersList) {
 			R4EUser dUser = (R4EUser) copyToResource(destResource, oUser, copier);
@@ -213,11 +213,11 @@ public class ModelTransformImpl implements ModelTransform {
 		//The review is a new element extended from original review.
 		//Refresh all review references in the underneath structure to
 		//point to the extended one.
-		EList<R4EUser> destUsers = destReview.getUsersRes();
+		List<R4EUser> destUsers = destReview.getUsersRes();
 		for (R4EUser user : destUsers) {
 			//update it at the user 
 			user.setReviewInstance(destReview);
-			EList<R4EComment> comments = user.getAddedComments();
+			List<R4EComment> comments = user.getAddedComments();
 			for (R4EComment comment : comments) {
 				if (comment instanceof R4EAnomaly) {
 					R4EAnomaly anomaly = (R4EAnomaly) comment;
@@ -226,7 +226,7 @@ public class ModelTransformImpl implements ModelTransform {
 				}
 			}
 
-			EList<R4EItem> items = user.getAddedItems();
+			List<R4EItem> items = user.getAddedItems();
 			for (R4EItem item : items) {
 				//update of review instance at review item level
 				item.setReview(destReview);
@@ -306,7 +306,7 @@ public class ModelTransformImpl implements ModelTransform {
 		destReview.setFragmentVersion(origReview.getFragmentVersion());
 
 		//copy review components
-		EList<String> components = origReview.getComponents();
+		List<String> components = origReview.getComponents();
 		for (Object element : components) {
 			String component = (String) element;
 			destReview.getComponents().add(component);
@@ -314,7 +314,7 @@ public class ModelTransformImpl implements ModelTransform {
 
 		if (origReview instanceof R4EFormalReview) {
 			R4EFormalReview formalRevOrig = (R4EFormalReview) origReview;
-			EList<R4EReviewPhaseInfo> phases = formalRevOrig.getPhases();
+			List<R4EReviewPhaseInfo> phases = formalRevOrig.getPhases();
 			if (phases != null) {
 				R4EReviewPhaseInfo currentPhase = formalRevOrig.getCurrent();
 				R4EReviewPhaseInfo[] movingPhases = phases.toArray(new R4EReviewPhaseInfo[0]);
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/ReviewGroupRes.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/ReviewGroupRes.java
index dbebfc43..59a6ff48 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/ReviewGroupRes.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/ReviewGroupRes.java
@@ -12,7 +12,6 @@
 package org.eclipse.mylyn.reviews.r4e.internal.transform.resources;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/ReviewRes.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/ReviewRes.java
index 21d610f4..ff223f27 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/ReviewRes.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/ReviewRes.java
@@ -12,9 +12,7 @@
 package org.eclipse.mylyn.reviews.r4e.internal.transform.resources;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFormalReview;
-import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUser;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/TransResPackage.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/TransResPackage.java
index 0eac7348..0b1086e8 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/TransResPackage.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/TransResPackage.java
@@ -89,14 +89,6 @@ public interface TransResPackage extends EPackage {
 	int REVIEW_GROUP_RES__FRAGMENT_VERSION = RModelPackage.R4E_REVIEW_GROUP__FRAGMENT_VERSION;
 
 	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_GROUP_RES__COMPATIBILITY = RModelPackage.R4E_REVIEW_GROUP__COMPATIBILITY;
-
-	/**
 	 * The feature id for the '<em><b>Reviews</b></em>' containment reference list. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
@@ -271,14 +263,6 @@ public interface TransResPackage extends EPackage {
 	int REVIEW_RES__FRAGMENT_VERSION = RModelPackage.R4E_FORMAL_REVIEW__FRAGMENT_VERSION;
 
 	/**
-	 * The feature id for the '<em><b>Compatibility</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int REVIEW_RES__COMPATIBILITY = RModelPackage.R4E_FORMAL_REVIEW__COMPATIBILITY;
-
-	/**
 	 * The feature id for the '<em><b>Topics</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -293,7 +277,7 @@ public interface TransResPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int REVIEW_RES__REVIEW_ITEMS = RModelPackage.R4E_FORMAL_REVIEW__REVIEW_ITEMS;
+	int REVIEW_RES__REVIEW_ITEMS = RModelPackage.R4E_FORMAL_REVIEW__ITEMS;
 
 	/**
 	 * The feature id for the '<em><b>Review Task</b></em>' containment reference. <!-- begin-user-doc --> <!--
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/ReviewGroupResImpl.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/ReviewGroupResImpl.java
index a3c3f119..6672f16f 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/ReviewGroupResImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/ReviewGroupResImpl.java
@@ -15,18 +15,13 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewGroupImpl;
-
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewGroupRes;
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewRes;
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.TransResPackage;
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/ReviewResImpl.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/ReviewResImpl.java
index ae8b8ca8..64fed87e 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/ReviewResImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/ReviewResImpl.java
@@ -14,20 +14,13 @@ package org.eclipse.mylyn.reviews.r4e.internal.transform.resources.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUser;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EFormalReviewImpl;
-import org.eclipse.mylyn.reviews.r4e.core.model.impl.R4EReviewImpl;
-
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewRes;
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.TransResPackage;
 
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/TransResFactoryImpl.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/TransResFactoryImpl.java
index 7f6be207..120826a2 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/TransResFactoryImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/TransResFactoryImpl.java
@@ -14,12 +14,12 @@ package org.eclipse.mylyn.reviews.r4e.internal.transform.resources.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.*;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewGroupRes;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewRes;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.TransResFactory;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.TransResPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/TransResPackageImpl.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/TransResPackageImpl.java
index 399dbe43..b3134f52 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/TransResPackageImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/impl/TransResPackageImpl.java
@@ -15,11 +15,8 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelPackage;
-
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewGroupRes;
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewRes;
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.TransResFactory;
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResAdapterFactory.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResAdapterFactory.java
index 0c59d2cd..3e0984a8 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResAdapterFactory.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResAdapterFactory.java
@@ -13,22 +13,18 @@ package org.eclipse.mylyn.reviews.r4e.internal.transform.resources.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
+import org.eclipse.mylyn.reviews.core.model.IReview;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFormalReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
-
-import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.*;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewGroupRes;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewRes;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.TransResPackage;
 
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
@@ -92,17 +88,12 @@ public class TransResAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
-		public Adapter caseReviewComponent(ReviewComponent object) {
+		public Adapter caseReviewComponent(IReviewComponent object) {
 			return createReviewComponentAdapter();
 		}
 
 		@Override
-		public Adapter caseSubModelRoot(SubModelRoot object) {
-			return createSubModelRootAdapter();
-		}
-
-		@Override
-		public Adapter caseReviewGroup(ReviewGroup object) {
+		public Adapter caseReviewGroup(IReviewGroup object) {
 			return createReviewGroupAdapter();
 		}
 
@@ -117,7 +108,7 @@ public class TransResAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
-		public Adapter caseReview(Review object) {
+		public Adapter caseReview(IReview object) {
 			return createReviewAdapter();
 		}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResResourceFactoryImpl.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResResourceFactoryImpl.java
index 4302f396..d303724d 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResResourceFactoryImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResResourceFactoryImpl.java
@@ -12,11 +12,8 @@
 package org.eclipse.mylyn.reviews.r4e.internal.transform.resources.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
 import org.eclipse.emf.ecore.xmi.XMLResource;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResResourceImpl.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResResourceImpl.java
index 7668022a..cfe46379 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResResourceImpl.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResResourceImpl.java
@@ -12,7 +12,6 @@
 package org.eclipse.mylyn.reviews.r4e.internal.transform.resources.util;
 
 import org.eclipse.emf.common.util.URI;
-
 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResSwitch.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResSwitch.java
index fe75453d..2012e3d6 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResSwitch.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResSwitch.java
@@ -15,18 +15,16 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewGroup;
-
-import org.eclipse.mylyn.reviews.frame.core.model.SubModelRoot;
+import org.eclipse.mylyn.reviews.core.model.IReview;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFormalReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
-
-import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.*;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewGroupRes;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.ReviewRes;
+import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.TransResPackage;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
@@ -95,37 +93,44 @@ public class TransResSwitch<T> {
 		case TransResPackage.REVIEW_GROUP_RES: {
 			ReviewGroupRes reviewGroupRes = (ReviewGroupRes) theEObject;
 			T result = caseReviewGroupRes(reviewGroupRes);
-			if (result == null)
+			if (result == null) {
 				result = caseR4EReviewGroup(reviewGroupRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = caseReviewGroup(reviewGroupRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = caseR4EReviewComponent(reviewGroupRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = caseReviewComponent(reviewGroupRes);
-			if (result == null)
-				result = caseSubModelRoot(reviewGroupRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = defaultCase(theEObject);
+			}
 			return result;
 		}
 		case TransResPackage.REVIEW_RES: {
 			ReviewRes reviewRes = (ReviewRes) theEObject;
 			T result = caseReviewRes(reviewRes);
-			if (result == null)
+			if (result == null) {
 				result = caseR4EFormalReview(reviewRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = caseR4EReview(reviewRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = caseReview(reviewRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = caseR4EReviewComponent(reviewRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = caseReviewComponent(reviewRes);
-			if (result == null)
-				result = caseSubModelRoot(reviewRes);
-			if (result == null)
+			}
+			if (result == null) {
 				result = defaultCase(theEObject);
+			}
 			return result;
 		}
 		default:
@@ -173,22 +178,7 @@ public class TransResSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReviewComponent(ReviewComponent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sub Model Root</em>'. <!-- begin-user-doc
-	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
-	 * -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sub Model Root</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSubModelRoot(SubModelRoot object) {
+	public T caseReviewComponent(IReviewComponent object) {
 		return null;
 	}
 
@@ -202,7 +192,7 @@ public class TransResSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReviewGroup(ReviewGroup object) {
+	public T caseReviewGroup(IReviewGroup object) {
 		return null;
 	}
 
@@ -246,7 +236,7 @@ public class TransResSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReview(Review object) {
+	public T caseReview(IReview object) {
 		return null;
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResXMLProcessor.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResXMLProcessor.java
index 8dd56211..cf541008 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResXMLProcessor.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/resources/util/TransResXMLProcessor.java
@@ -14,11 +14,8 @@ package org.eclipse.mylyn.reviews.r4e.internal.transform.resources.util;
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.resource.Resource;
-
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
 import org.eclipse.mylyn.reviews.r4e.internal.transform.resources.TransResPackage;
 
 /**
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/serial/impl/TResReader.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/serial/impl/TResReader.java
index 6b664c66..743d309c 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/serial/impl/TResReader.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/serial/impl/TResReader.java
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -48,7 +47,7 @@ public class TResReader extends R4EReader implements IModelReader {
 			return null;
 		}
 
-		EList<EObject> eObjects = getObjects(aRootPath, resSet);
+		List<EObject> eObjects = getObjects(aRootPath, resSet);
 		return findType(type, eObjects);
 	}
 
@@ -59,7 +58,7 @@ public class TResReader extends R4EReader implements IModelReader {
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	private <T> T findType(Class<T> type, EList<EObject> eObjects) {
+	private <T> T findType(Class<T> type, List<EObject> eObjects) {
 		T element = null;
 		for (EObject eobject : eObjects) {
 			if (type.isAssignableFrom(eobject.getClass())) {
@@ -86,7 +85,7 @@ public class TResReader extends R4EReader implements IModelReader {
 	// }
 	//
 	// List<T> resElements = new ArrayList<T>();
-	// EList<EObject> eObjects = getObjects(aRootPath);
+	// List<EObject> eObjects = getObjects(aRootPath);
 	//
 	// for (EObject eobject : eObjects) {
 	// if (type.isAssignableFrom(eobject.getClass())) {
@@ -104,7 +103,7 @@ public class TResReader extends R4EReader implements IModelReader {
 	 * @return
 	 * @throws ResourceHandlingException
 	 */
-	private EList<EObject> getObjects(URI resourcePath) throws ResourceHandlingException {
+	private List<EObject> getObjects(URI resourcePath) throws ResourceHandlingException {
 		// Create the resouce pointing to the specified URI
 		Resource resource = createResourceSetWithResource(resourcePath);
 		return getObjects(resourcePath, resource);
@@ -116,7 +115,7 @@ public class TResReader extends R4EReader implements IModelReader {
 	 * @return
 	 * @throws ResourceHandlingException
 	 */
-	private EList<EObject> getObjects(URI resourcePath, ResourceSet resSet) throws ResourceHandlingException {
+	private List<EObject> getObjects(URI resourcePath, ResourceSet resSet) throws ResourceHandlingException {
 		Resource resource = createResource(resourcePath, resSet);
 		return getObjects(resourcePath, resource);
 	}
@@ -128,7 +127,7 @@ public class TResReader extends R4EReader implements IModelReader {
 	 * @return
 	 * @throws ResourceHandlingException
 	 */
-	private EList<EObject> getObjects(URI resourcePath, Resource resource) throws ResourceHandlingException {
+	private List<EObject> getObjects(URI resourcePath, Resource resource) throws ResourceHandlingException {
 		// Load resources
 		try {
 			resource.load(null);
@@ -138,7 +137,7 @@ public class TResReader extends R4EReader implements IModelReader {
 			throw exception;
 		}
 
-		EList<EObject> eObjects = resource.getContents();
+		List<EObject> eObjects = resource.getContents();
 		return eObjects;
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/serial/impl/TResWriter.java b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/serial/impl/TResWriter.java
index 57265d48..34df4651 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/serial/impl/TResWriter.java
+++ b/org.eclipse.mylyn.reviews.r4e.transform/src/org/eclipse/mylyn/reviews/r4e/internal/transform/serial/impl/TResWriter.java
@@ -54,7 +54,7 @@ public class TResWriter extends R4EWriter implements IModelWriter {
 //		// options = new HashMap<String, Boolean>();
 //		// options.put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
 //
-//		EList<Resource> resources = resourceSet.getResources();
+//		List<Resource> resources = resourceSet.getResources();
 //		if (resources != null) {
 //			for (Resource resource : resources) {
 //				saveResource(resource);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.ui.tests/META-INF/MANIFEST.MF
index dad022f7..57aa1ce7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/META-INF/MANIFEST.MF
@@ -14,9 +14,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.core;bundle-version="3.5.0",
  org.eclipse.jdt.launching;bundle-version="3.5.200",
  org.eclipse.cdt.core;bundle-version="5.2.1",
- org.eclipse.mylyn.reviews.r4e.ui,
- org.eclipse.mylyn.reviews.r4e.core,
- org.eclipse.mylyn.reviews.frame.core,
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",
  org.eclipse.emf.ecore;bundle-version="2.5.0",
  org.mockito;bundle-version="1.8.4",
@@ -31,7 +28,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.hamcrest;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.mylyn.git.ui;bundle-version="0.9.1",
  org.eclipse.mylyn.git.core;bundle-version="0.9.1",
- org.eclipse.mylyn.reviews.ldap;bundle-version="0.10.0"
+ org.eclipse.mylyn.reviews.ldap;bundle-version="0.10.0",
+ org.eclipse.mylyn.reviews.r4e.ui,
+ org.eclipse.mylyn.reviews.r4e.core,
+ org.eclipse.mylyn.reviews.core;bundle-version="1.1.0"
 Import-Package: org.eclipse.jface.text,
  org.eclipse.mylyn.reviews.frame.ui.annotation,
  org.eclipse.mylyn.reviews.frame.ui.annotation.impl,
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/R4EUITestPlugin.java b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/R4EUITestPlugin.java
index fefaad7f..2dcee96c 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/R4EUITestPlugin.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/R4EUITestPlugin.java
@@ -20,7 +20,7 @@ package org.eclipse.mylyn.reviews.r4e.ui.tests;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.FormColors;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/CloneAnomaliesCommentsTests.java b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/CloneAnomaliesCommentsTests.java
index 4a97a87b..4030f1a7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/CloneAnomaliesCommentsTests.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/CloneAnomaliesCommentsTests.java
@@ -437,7 +437,7 @@ public class CloneAnomaliesCommentsTests extends TestCase {
 		Assert.assertNotNull(uiParticipant);
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_ID, uiParticipant.getParticipant().getId());
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_EMAIL, uiParticipant.getParticipant().getEmail());
-		Assert.assertEquals(R4EUserRole.R4E_ROLE_REVIEWER, uiParticipant.getParticipant().getRoles().get(0));
+		Assert.assertEquals(R4EUserRole.REVIEWER, uiParticipant.getParticipant().getRoles().get(0));
 	}
 
 	/**
@@ -464,10 +464,10 @@ public class CloneAnomaliesCommentsTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fAnomaly1.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				((R4EUITextPosition) content1.getPosition()).getOffset(),
-				((R4ETextPosition) ((R4ETextContent) fAnomaly1.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+				((R4ETextPosition) ((R4ETextContent) fAnomaly1.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(
 				((R4EUITextPosition) content1.getPosition()).getLength(),
-				((R4ETextPosition) ((R4ETextContent) fAnomaly1.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fAnomaly1.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 
 		//Anomaly2
 		R4EUIContent content2 = fItem.getFileContexts()
@@ -489,10 +489,10 @@ public class CloneAnomaliesCommentsTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fAnomaly2.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				((R4EUITextPosition) content2.getPosition()).getOffset(),
-				((R4ETextPosition) ((R4ETextContent) fAnomaly2.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+				((R4ETextPosition) ((R4ETextContent) fAnomaly2.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(
 				((R4EUITextPosition) content2.getPosition()).getLength(),
-				((R4ETextPosition) ((R4ETextContent) fAnomaly2.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fAnomaly2.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotations(fAnomaly2.getParent().getChildren(), true,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
@@ -536,10 +536,10 @@ public class CloneAnomaliesCommentsTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_ID, fClonedAnomaly1.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				20,
-				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly1.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly1.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(
 				50,
-				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly1.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly1.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fClonedAnomaly1, true,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
 	}
@@ -561,10 +561,10 @@ public class CloneAnomaliesCommentsTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_ID, fClonedAnomaly2.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				0,
-				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly2.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
-		Assert.assertEquals(
-				755,
-				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly2.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly2.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
+		Assert.assertEquals(755, ((R4ETextPosition) ((R4ETextContent) fClonedAnomaly2.getAnomaly()
+				.getLocations()
+				.get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fClonedAnomaly2, false,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
 	}
@@ -624,10 +624,10 @@ public class CloneAnomaliesCommentsTests extends TestCase {
 		Assert.assertEquals(0, fClonedAnomaly4.getAnomaly().getAssignedTo().size());
 		Assert.assertEquals(
 				((R4ETextPosition) targetContent.getContent().getTarget().getLocation()).getStartPosition(),
-				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly4.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly4.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(
 				((R4ETextPosition) targetContent.getContent().getTarget().getLocation()).getLength(),
-				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly4.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fClonedAnomaly4.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fClonedAnomaly4, true,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/DuplicateAnomalyTests.java b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/DuplicateAnomalyTests.java
index a9675ece..a84a7a42 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/DuplicateAnomalyTests.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/DuplicateAnomalyTests.java
@@ -578,10 +578,10 @@ public class DuplicateAnomalyTests extends TestCase {
 				Assert.assertEquals(TestConstants.ANOMALY_TEST_DUE_DATE, fLinkedAnomaly1.getAnomaly().getDueDate());
 				Assert.assertEquals(
 						((R4EUITextPosition) content.getPosition()).getOffset(),
-						((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly1.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+						((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly1.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 				Assert.assertEquals(
 						((R4EUITextPosition) content.getPosition()).getLength(),
-						((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly1.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+						((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly1.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 				Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fLinkedAnomaly1.getAnomaly()
 						.getAssignedTo()
 						.get(0));
@@ -603,10 +603,10 @@ public class DuplicateAnomalyTests extends TestCase {
 					Assert.assertEquals(TestConstants.ANOMALY_TEST_DUE_DATE, fLinkedAnomaly2.getAnomaly().getDueDate());
 					Assert.assertEquals(
 							((R4EUITextPosition) content.getPosition()).getOffset(),
-							((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly2.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+							((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly2.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 					Assert.assertEquals(
 							((R4EUITextPosition) content.getPosition()).getLength(),
-							((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly2.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+							((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly2.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 					Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fLinkedAnomaly2.getAnomaly()
 							.getAssignedTo()
 							.get(0));
@@ -671,10 +671,10 @@ public class DuplicateAnomalyTests extends TestCase {
 		Assert.assertEquals(TestConstants.ANOMALY_TEST_DUE_DATE, fExternalAnomaly.getAnomaly().getDueDate());
 		Assert.assertEquals(
 				0,
-				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
-		Assert.assertEquals(764, ((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly()
-				.getLocation()
-				.get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
+		Assert.assertEquals(
+				764,
+				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/PostponedAnomaliesTests.java b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/PostponedAnomaliesTests.java
index 0216ccb7..f7e43ebd 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/PostponedAnomaliesTests.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/feature/PostponedAnomaliesTests.java
@@ -467,7 +467,7 @@ public class PostponedAnomaliesTests extends TestCase {
 		Assert.assertNotNull(uiParticipant);
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_ID, uiParticipant.getParticipant().getId());
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_EMAIL, uiParticipant.getParticipant().getEmail());
-		Assert.assertEquals(R4EUserRole.R4E_ROLE_REVIEWER, uiParticipant.getParticipant().getRoles().get(0));
+		Assert.assertEquals(R4EUserRole.REVIEWER, uiParticipant.getParticipant().getRoles().get(0));
 	}
 
 	/**
@@ -494,10 +494,10 @@ public class PostponedAnomaliesTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fOriginalAnomaly1.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				((R4EUITextPosition) content1.getPosition()).getOffset(),
-				((R4ETextPosition) ((R4ETextContent) fOriginalAnomaly1.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+				((R4ETextPosition) ((R4ETextContent) fOriginalAnomaly1.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(
 				((R4EUITextPosition) content1.getPosition()).getLength(),
-				((R4ETextPosition) ((R4ETextContent) fOriginalAnomaly1.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fOriginalAnomaly1.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 		fProxy.getAnomalyProxy().progressAnomaly(fOriginalAnomaly1, TestConstants.ANOMALY_STATE_POSTPONED);
 		Assert.assertEquals(TestConstants.ANOMALY_STATE_POSTPONED, fOriginalAnomaly1.getAnomaly().getState());
 		fOriginalAnomaly1Title = fOriginalAnomaly1.getAnomaly().getTitle();
@@ -522,10 +522,10 @@ public class PostponedAnomaliesTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fOriginalAnomaly2.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				((R4EUITextPosition) content2.getPosition()).getOffset(),
-				((R4ETextPosition) ((R4ETextContent) fOriginalAnomaly2.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+				((R4ETextPosition) ((R4ETextContent) fOriginalAnomaly2.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(
 				((R4EUITextPosition) content2.getPosition()).getLength(),
-				((R4ETextPosition) ((R4ETextContent) fOriginalAnomaly2.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fOriginalAnomaly2.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 		fProxy.getAnomalyProxy().progressAnomaly(fOriginalAnomaly2, TestConstants.ANOMALY_STATE_POSTPONED);
 		Assert.assertEquals(TestConstants.ANOMALY_STATE_POSTPONED, fOriginalAnomaly2.getAnomaly().getState());
 		fOriginalAnomaly2Title = fOriginalAnomaly2.getAnomaly().getTitle();
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/proxy/R4EUITestPreferences.java b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/proxy/R4EUITestPreferences.java
index f82becd9..aee330ff 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/proxy/R4EUITestPreferences.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/proxy/R4EUITestPreferences.java
@@ -55,7 +55,7 @@ public class R4EUITestPreferences extends R4EUITestElement {
 				PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(null, PREFERENCES_PAGE_ID, null,
 						null);
 				R4EPreferencePage preferences = (R4EPreferencePage) dialog.getSelectedPage();
-				setUser(preferences.getUser());
+				setUser(preferences.getAuthor());
 				preferences.performOk();
 				dialog.close();
 			}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/sanity/SanityBasicTests.java b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/sanity/SanityBasicTests.java
index e4ae09b1..b5f58eeb 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/sanity/SanityBasicTests.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/sanity/SanityBasicTests.java
@@ -414,7 +414,7 @@ public class SanityBasicTests extends TestCase {
 		Assert.assertNotNull(fParticipant);
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_ID, fParticipant.getParticipant().getId());
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_EMAIL, fParticipant.getParticipant().getEmail());
-		Assert.assertEquals(R4EUserRole.R4E_ROLE_REVIEWER, fParticipant.getParticipant().getRoles().get(0));
+		Assert.assertEquals(R4EUserRole.REVIEWER, fParticipant.getParticipant().getRoles().get(0));
 	}
 
 	/**
@@ -439,10 +439,10 @@ public class SanityBasicTests extends TestCase {
 				.getAssignedTo()
 				.get(0));
 		Assert.assertEquals(20, ((R4ETextPosition) ((R4ETextContent) fCompareEditorAnomaly.getAnomaly()
-				.getLocation()
+				.getLocations()
 				.get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(50, ((R4ETextPosition) ((R4ETextContent) fCompareEditorAnomaly.getAnomaly()
-				.getLocation()
+				.getLocations()
 				.get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fCompareEditorAnomaly, true,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
@@ -471,10 +471,10 @@ public class SanityBasicTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fLinkedAnomaly.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				((R4EUITextPosition) content.getPosition()).getOffset(),
-				((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+				((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(
 				((R4EUITextPosition) content.getPosition()).getLength(),
-				((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fLinkedAnomaly, true,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
 	}
@@ -498,10 +498,10 @@ public class SanityBasicTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fExternalAnomaly.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				0,
-				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
-		Assert.assertEquals(755, ((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly()
-				.getLocation()
-				.get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
+		Assert.assertEquals(
+				755,
+				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fExternalAnomaly, false,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
 	}
@@ -520,8 +520,7 @@ public class SanityBasicTests extends TestCase {
 	 */
 	private void progressReview() {
 		fProxy.getReviewProxy().progressReview(fReview);
-		Assert.assertEquals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED,
-				((R4EReviewState) fReview.getReview().getState()).getState());
+		Assert.assertEquals(R4EReviewPhase.COMPLETED, ((R4EReviewState) fReview.getReview().getState()).getState());
 		Assert.assertNotNull(fReview.getReview().getEndDate());
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/sanity/SanityInformalTests.java b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/sanity/SanityInformalTests.java
index 5ad417c1..bf89199a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/sanity/SanityInformalTests.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/sanity/SanityInformalTests.java
@@ -420,7 +420,7 @@ public class SanityInformalTests extends TestCase {
 		Assert.assertNotNull(fParticipant);
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_ID, fParticipant.getParticipant().getId());
 		Assert.assertEquals(TestConstants.PARTICIPANT_TEST_EMAIL, fParticipant.getParticipant().getEmail());
-		Assert.assertEquals(R4EUserRole.R4E_ROLE_REVIEWER, fParticipant.getParticipant().getRoles().get(0));
+		Assert.assertEquals(R4EUserRole.REVIEWER, fParticipant.getParticipant().getRoles().get(0));
 	}
 
 	/**
@@ -445,10 +445,10 @@ public class SanityInformalTests extends TestCase {
 				.getAssignedTo()
 				.get(0));
 		Assert.assertEquals(20, ((R4ETextPosition) ((R4ETextContent) fCompareEditorAnomaly.getAnomaly()
-				.getLocation()
+				.getLocations()
 				.get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(50, ((R4ETextPosition) ((R4ETextContent) fCompareEditorAnomaly.getAnomaly()
-				.getLocation()
+				.getLocations()
 				.get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fCompareEditorAnomaly, true,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
@@ -477,10 +477,10 @@ public class SanityInformalTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fLinkedAnomaly.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				((R4EUITextPosition) content.getPosition()).getOffset(),
-				((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
+				((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
 		Assert.assertEquals(
 				((R4EUITextPosition) content.getPosition()).getLength(),
-				((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly.getAnomaly().getLocation().get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fLinkedAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fLinkedAnomaly, true,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
 	}
@@ -504,10 +504,10 @@ public class SanityInformalTests extends TestCase {
 		Assert.assertEquals(TestConstants.PARTICIPANT_ASSIGN_TO, fExternalAnomaly.getAnomaly().getAssignedTo().get(0));
 		Assert.assertEquals(
 				0,
-				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocation().get(0)).getLocation()).getStartPosition());
-		Assert.assertEquals(755, ((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly()
-				.getLocation()
-				.get(0)).getLocation()).getLength());
+				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getStartPosition());
+		Assert.assertEquals(
+				755,
+				((R4ETextPosition) ((R4ETextContent) fExternalAnomaly.getAnomaly().getLocations().get(0)).getLocation()).getLength());
 		Assert.assertTrue(fProxy.getCommandProxy().verifyAnnotation(fExternalAnomaly, false,
 				R4EUIConstants.ANOMALY_OPEN_ANNOTATION_ID));
 	}
@@ -603,8 +603,7 @@ public class SanityInformalTests extends TestCase {
 		Assert.assertEquals(TestConstants.REVIEW_EXIT_DECISION_ACCEPTED, fReview.getReview().getDecision().getValue()); //Test the default exit decision
 
 		fProxy.getReviewProxy().progressReview(fReview);
-		Assert.assertEquals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED,
-				((R4EReviewState) fReview.getReview().getState()).getState());
+		Assert.assertEquals(R4EReviewPhase.COMPLETED, ((R4EReviewState) fReview.getReview().getState()).getState());
 		Assert.assertNotNull(fReview.getReview().getEndDate());
 	}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/utils/TestConstants.java b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/utils/TestConstants.java
index bf3a6465..455ee5e3 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/utils/TestConstants.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/src/org/eclipse/mylyn/reviews/r4e/ui/tests/utils/TestConstants.java
@@ -46,7 +46,7 @@ public class TestConstants {
 
 	//The following chars should not be used as strange chars: \/<>:;*"?'
 	//May be we should add a validation for the review name and review group
-	public static final String REVIEW_GROUP_TEST_NAME_STRANGE = "test Review Group É.!@#$%^&()";
+	public static final String REVIEW_GROUP_TEST_NAME_STRANGE = "test Review Group �.!@#$%^&()";
 
 	public static final String REVIEW_GROUP_TEST_NAME2 = "testReviewGroup2";
 
@@ -75,7 +75,7 @@ public class TestConstants {
 	public static final String[] REVIEW_GROUP_TEST_AVAILABLE_COMPONENTS2 = { "core", "docs", "help" };
 
 	//Reviews BASIC
-	public static final R4EReviewType REVIEW_TEST_TYPE_BASIC = R4EReviewType.R4E_REVIEW_TYPE_BASIC;
+	public static final R4EReviewType REVIEW_TEST_TYPE_BASIC = R4EReviewType.BASIC;
 
 	public static final String REVIEW_TEST_NAME = "testReview";
 
@@ -94,7 +94,7 @@ public class TestConstants {
 	public static final String REVIEW_TEST_REFERENCE_MATERIALS = "testReview reference materials";
 
 	//Reviews INFORMAL
-	public static final R4EReviewType REVIEW_TEST_TYPE_INFORMAL = R4EReviewType.R4E_REVIEW_TYPE_INFORMAL;
+	public static final R4EReviewType REVIEW_TEST_TYPE_INFORMAL = R4EReviewType.INFORMAL;
 
 	public static final String REVIEW_TEST_NAME_INF = "testReviewInf";
 
@@ -104,14 +104,14 @@ public class TestConstants {
 	//May be we should add a validation for the review name and review group
 	public static final String REVIEW_STRANGE_NAME_INF = "test Review&%$/) Inf";
 
-	public static final R4EDecision REVIEW_EXIT_DECISION_ACCEPTED = R4EDecision.R4E_REVIEW_DECISION_ACCEPTED;
+	public static final R4EDecision REVIEW_EXIT_DECISION_ACCEPTED = R4EDecision.ACCEPTED;
 
 	//Participants
 	public static final String PARTICIPANT_TEST_ID = "user";
 
 	public static final String PARTICIPANT_TEST_EMAIL = "user@company.com";
 
-	public static final R4EUserRole[] PARTICIPANT_TEST_ROLES = { R4EUserRole.R4E_ROLE_REVIEWER };
+	public static final R4EUserRole[] PARTICIPANT_TEST_ROLES = { R4EUserRole.REVIEWER };
 
 	public static final String PARTICIPANT_TEST_FOCUS_AREA = "Test FocusArea";
 
@@ -131,27 +131,27 @@ public class TestConstants {
 
 	public static final String EXTERNAL_ANOMALY_TEST_DESCRIPTION = "new External Anomaly description";
 
-	public static final R4EDesignRuleClass ANOMALY_TEST_CLASS_ERRONEOUS = R4EDesignRuleClass.R4E_CLASS_ERRONEOUS;
+	public static final R4EDesignRuleClass ANOMALY_TEST_CLASS_ERRONEOUS = R4EDesignRuleClass.ERRONEOUS;
 
-	public static final R4EDesignRuleClass ANOMALY_TEST_CLASS_IMPROVEMENT = R4EDesignRuleClass.R4E_CLASS_IMPROVEMENT;
+	public static final R4EDesignRuleClass ANOMALY_TEST_CLASS_IMPROVEMENT = R4EDesignRuleClass.IMPROVEMENT;
 
-	public static final R4EDesignRuleClass ANOMALY_TEST_CLASS_QUESTION = R4EDesignRuleClass.R4E_CLASS_QUESTION;
+	public static final R4EDesignRuleClass ANOMALY_TEST_CLASS_QUESTION = R4EDesignRuleClass.QUESTION;
 
-	public static final R4EDesignRuleRank ANOMALY_TEST_RANK_MAJOR = R4EDesignRuleRank.R4E_RANK_MAJOR;
+	public static final R4EDesignRuleRank ANOMALY_TEST_RANK_MAJOR = R4EDesignRuleRank.MAJOR;
 
-	public static final R4EDesignRuleRank ANOMALY_TEST_RANK_MINOR = R4EDesignRuleRank.R4E_RANK_MINOR;
+	public static final R4EDesignRuleRank ANOMALY_TEST_RANK_MINOR = R4EDesignRuleRank.MINOR;
 
 	public static final Date ANOMALY_TEST_DUE_DATE = new Date();
 
-	public static final R4EAnomalyState ANOMALY_STATE_ASSIGNED = R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED;
+	public static final R4EAnomalyState ANOMALY_STATE_ASSIGNED = R4EAnomalyState.ASSIGNED;
 
-	public static final R4EAnomalyState ANOMALY_STATE_FIXED = R4EAnomalyState.R4E_ANOMALY_STATE_FIXED;
+	public static final R4EAnomalyState ANOMALY_STATE_FIXED = R4EAnomalyState.FIXED;
 
-	public static final R4EAnomalyState ANOMALY_STATE_REJECTED = R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED;
+	public static final R4EAnomalyState ANOMALY_STATE_REJECTED = R4EAnomalyState.REJECTED;
 
-	public static final R4EAnomalyState ANOMALY_STATE_VERIFIED = R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED;
+	public static final R4EAnomalyState ANOMALY_STATE_VERIFIED = R4EAnomalyState.VERIFIED;
 
-	public static final R4EAnomalyState ANOMALY_STATE_POSTPONED = R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED;
+	public static final R4EAnomalyState ANOMALY_STATE_POSTPONED = R4EAnomalyState.DEFERRED;
 
 	//Comments
 	public static final String COMMENT_TEST = "This is a test comment for the anomaly";
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.ui/META-INF/MANIFEST.MF
index f8bd09c0..c836b29b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.ui/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.editors;bundle-version="3.5.0",
  org.eclipse.jdt.core;bundle-version="3.5.0";resolution:=optional,
  org.eclipse.cdt.core;bundle-version="5.0.0";resolution:=optional,
- org.eclipse.mylyn.reviews.frame.core;bundle-version="0.10.0",
  org.eclipse.mylyn.reviews.r4e.core;bundle-version="0.10.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",
  org.eclipse.emf.ecore;bundle-version="2.5.0",
@@ -25,8 +24,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.reviews.ldap;bundle-version="0.10.0";resolution:=optional,
  org.eclipse.mylyn.reviews.notifications;bundle-version="0.10.0",
  org.eclipse.mylyn.reviews.r4e.mail.smtp;bundle-version="0.11.0",
- org.eclipse.mylyn.reviews.r4e.report;bundle-version="0.12.0";resolution:=optional,
- org.eclipse.mylyn.reviews.frame.ui;bundle-version="0.12.0"
+ org.eclipse.mylyn.reviews.r4e.report;bundle-version="0.13.0";resolution:=optional,
+ org.eclipse.mylyn.reviews.frame.ui;bundle-version="0.13.0",
+ org.eclipse.mylyn.reviews.core;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/R4EUIPlugin.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/R4EUIPlugin.java
index 8c324474..e4868bea 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/R4EUIPlugin.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/R4EUIPlugin.java
@@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IBundleGroupProvider;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.FormColors;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotationModel.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotationModel.java
index dd60fb1b..2162eca4 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotationModel.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotationModel.java
@@ -362,9 +362,9 @@ public class R4EAnnotationModel implements IReviewAnnotationModel {
 	public void removeAnnotation(Object aAnnotationContent) {
 		R4EID id = null;
 		if (aAnnotationContent instanceof R4EUIAnomalyBasic) {
-			id = ((R4EUIAnomalyBasic) aAnnotationContent).getAnomaly().getId();
+			id = ((R4EUIAnomalyBasic) aAnnotationContent).getAnomaly().getR4eId();
 		} else if (aAnnotationContent instanceof R4EUIContent) {
-			id = ((R4EUIContent) aAnnotationContent).getContent().getId();
+			id = ((R4EUIContent) aAnnotationContent).getContent().getR4eId();
 		}
 		if (null != id) {
 			final IReviewAnnotation removedAnnotation = fAnnotationsMap.remove(id);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnomalyAnnotation.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnomalyAnnotation.java
index 0f51bc84..15dff76d 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnomalyAnnotation.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnomalyAnnotation.java
@@ -23,7 +23,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ECommentType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EID;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleRank;
@@ -90,7 +89,7 @@ public class R4EAnomalyAnnotation extends R4EAnnotation {
 	 */
 	@Override
 	public R4EID getId() {
-		return ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getId();
+		return ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getR4eId();
 	}
 
 	/**
@@ -136,20 +135,20 @@ public class R4EAnomalyAnnotation extends R4EAnnotation {
 		//Details
 		final List<String> detailsValues = new ArrayList<String>();
 		detailsValues.add(R4EUIConstants.AUTHOR_LABEL
-				+ ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getUser().getId());
+				+ ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getAuthor().getId());
 		final R4ECommentType commentType = (R4ECommentType) ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getType();
 		if (null != commentType) {
 			detailsValues.add(R4EUIConstants.CLASS_LABEL + (UIUtils.getClassStr(commentType.getType())));
 		}
 		final R4EDesignRuleRank rank = ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getRank();
-		if ((null != rank) && !rank.equals(R4EDesignRuleRank.R4E_RANK_NONE)) {
+		if ((null != rank) && !rank.equals(R4EDesignRuleRank.NONE)) {
 			detailsValues.add(R4EUIConstants.RANK_LABEL + UIUtils.getRankStr(rank));
 		}
 		final String ruleId = ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getRuleID();
 		if ((null != ruleId) && !ruleId.equals("")) { //$NON-NLS-1$
 			detailsValues.add(R4EUIConstants.RULE_ID_LABEL + ruleId);
 		}
-		final EList<String> assignees = ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getAssignedTo();
+		final List<String> assignees = ((R4EUIAnomalyBasic) fSourceElement).getAnomaly().getAssignedTo();
 		if (((null != assignees) && (assignees.size() > 0)) && !assignees.get(0).equals("")) { //$NON-NLS-1$
 			detailsValues.add(R4EUIConstants.ASSIGNED_TO_LABEL + assignees.get(0));
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4ECommentAnnotation.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4ECommentAnnotation.java
index 0fc9890d..c8d1eb5b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4ECommentAnnotation.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4ECommentAnnotation.java
@@ -59,7 +59,7 @@ public class R4ECommentAnnotation extends R4EAnnotation {
 	 *            R4EAnomalyAnnotation
 	 */
 	public R4ECommentAnnotation(R4EUIComment aSourceComment, R4EAnomalyAnnotation aParentAnomaly) {
-		super(aSourceComment, getAnnotationType(aSourceComment), aSourceComment.getComment().getUser().getId());
+		super(aSourceComment, getAnnotationType(aSourceComment), aSourceComment.getComment().getAuthor().getId());
 		fParent = aParentAnomaly;
 		final StringTokenizer st = new StringTokenizer(aSourceComment.getComment().getDescription(),
 				R4EUIConstants.LINE_FEED);
@@ -90,7 +90,7 @@ public class R4ECommentAnnotation extends R4EAnnotation {
 	 */
 	@Override
 	public R4EID getId() {
-		return ((R4EUIComment) fSourceElement).getComment().getId();
+		return ((R4EUIComment) fSourceElement).getComment().getR4eId();
 	}
 
 	/**
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EContentAnnotation.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EContentAnnotation.java
index b180d9ac..c30864d6 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EContentAnnotation.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EContentAnnotation.java
@@ -17,7 +17,8 @@
 
 package org.eclipse.mylyn.reviews.r4e.ui.internal.annotation.content;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
+
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EID;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIPosition;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIContent;
@@ -68,7 +69,7 @@ public class R4EContentAnnotation extends R4EAnnotation {
 	 */
 	@Override
 	public R4EID getId() {
-		return ((R4EUIContent) fSourceElement).getContent().getId();
+		return ((R4EUIContent) fSourceElement).getContent().getR4eId();
 	}
 
 	/**
@@ -89,10 +90,10 @@ public class R4EContentAnnotation extends R4EAnnotation {
 	 */
 	public Object[] getChildren() {
 		R4EAnnotationText[] values = null;
-		final EList<String> assignees = ((R4EUIContent) fSourceElement).getContent().getAssignedTo();
+		final List<String> assignees = ((R4EUIContent) fSourceElement).getContent().getAssignedTo();
 		if ((null != assignees) && (assignees.size() > 0)) {
 			values = new R4EAnnotationText[1];
-			final EList<String> assignedParticipants = ((R4EUIContent) fSourceElement).getContent().getAssignedTo();
+			final List<String> assignedParticipants = ((R4EUIContent) fSourceElement).getContent().getAssignedTo();
 			values[0] = new R4EAnnotationText(this, R4EUIConstants.ASSIGNED_TO_LABEL
 					+ UIUtils.formatAssignedParticipants(assignedParticipants), null);
 		}
@@ -106,7 +107,7 @@ public class R4EContentAnnotation extends R4EAnnotation {
 	 * @see org.eclipse.mylyn.reviews.frame.ui.annotation.IReviewAnnotation#hasChildren()
 	 */
 	public boolean hasChildren() {
-		final EList<String> assignees = ((R4EUIContent) fSourceElement).getContent().getAssignedTo();
+		final List<String> assignees = ((R4EUIContent) fSourceElement).getContent().getAssignedTo();
 		if ((null != assignees) && (assignees.size() > 0)) {
 			return true;
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/FindReviewItemsHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/FindReviewItemsHandler.java
index 4b07cb80..fb77713e 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/FindReviewItemsHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/FindReviewItemsHandler.java
@@ -50,7 +50,6 @@ import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EContextType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileVersion;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFormalReview;
@@ -63,6 +62,7 @@ import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingExce
 import org.eclipse.mylyn.reviews.r4e.core.rfs.spi.IRFSRegistry;
 import org.eclipse.mylyn.reviews.r4e.core.rfs.spi.RFSRegistryFactory;
 import org.eclipse.mylyn.reviews.r4e.core.rfs.spi.ReviewsFileStorageException;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 import org.eclipse.mylyn.reviews.r4e.ui.R4EUIPlugin;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs.R4EUIDialogFactory;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.editors.R4ECompareEditorInput;
@@ -585,10 +585,10 @@ public class FindReviewItemsHandler extends AbstractHandler {
 									final List<R4EReviewComponent> addedItems = new ArrayList<R4EReviewComponent>();
 									addedItems.add(uiReviewItem.getItem());
 									final R4EReview review = uiReview.getReview();
-									if (review.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
+									if (review.getType().equals(R4EReviewType.FORMAL)) {
 										if (((R4EFormalReview) review).getCurrent()
 												.getType()
-												.equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
+												.equals(R4EReviewPhase.PREPARATION)) {
 											MailServicesProxy.sendItemsAddedNotification(addedItems);
 
 										}
@@ -912,4 +912,4 @@ public class FindReviewItemsHandler extends AbstractHandler {
 			return FindReviewItemsHandler.this.fRunningJobs.intValue() >= MAX_CONCURRRENT_JOBS;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
index d3598ec6..b50a8e35 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
@@ -26,11 +26,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
+import org.eclipse.mylyn.reviews.core.model.IComment;
+import org.eclipse.mylyn.reviews.core.model.IReviewItem;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
@@ -182,8 +181,8 @@ public class ImportPostponedHandler extends AbstractHandler {
 		try {
 			final R4EReview oldReview = R4EUIModelController.FModelExt.openR4EReview(
 					((R4EUIReviewGroup) aUiOldReview.getParent()).getReviewGroup(), aUiOldReview.getReview().getName());
-			final EList<Topic> oldAnomalies = oldReview.getTopics();
-			for (Topic oldAnomaly : oldAnomalies) {
+			final List<ITopic> oldAnomalies = oldReview.getTopics();
+			for (ITopic oldAnomaly : oldAnomalies) {
 
 				//Get parent file
 				R4EFileVersion oldAnomalyFile = CommandUtils.getAnomalyParentFile((R4EAnomaly) oldAnomaly);
@@ -195,7 +194,7 @@ public class ImportPostponedHandler extends AbstractHandler {
 					}
 				} else {
 
-					for (Item currentItem : currentReview.getReviewItems()) {
+					for (IReviewItem currentItem : currentReview.getItems()) {
 						//Ignore R4EUIPostponedContainer for current review here
 						if ((R4EUIConstants.TRUE_ATTR_VALUE_STR).equals(((R4EItem) currentItem).getInfoAtt().get(
 								R4EUIConstants.POSTPONED_ATTR_STR))) {
@@ -204,7 +203,7 @@ public class ImportPostponedHandler extends AbstractHandler {
 
 						//NOTE:  We compare the URI of the files.  This means that in order to be considered, 
 						//the version of the file in the current review need to be in the workspace.  This is a limitation.
-						EList<R4EFileContext> currentFiles = ((R4EItem) currentItem).getFileContextList();
+						List<R4EFileContext> currentFiles = ((R4EItem) currentItem).getFileContextList();
 						for (R4EFileContext currentFile : currentFiles) {
 							if (null != currentFile.getTarget()
 									&& null != currentFile.getTarget().getPlatformURI()
@@ -300,7 +299,7 @@ public class ImportPostponedHandler extends AbstractHandler {
 			if (aAddNewAnomalies) {
 
 				//If the anomaly is new and is postponed, add it
-				if (aOldAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED)) {
+				if (aOldAnomaly.getState().equals(R4EAnomalyState.DEFERRED)) {
 					if (null != aMonitor) {
 						aMonitor.subTask("Importing Postponed Global Anomaly for Review: " + aUiReview.getName());
 					}
@@ -308,8 +307,8 @@ public class ImportPostponedHandler extends AbstractHandler {
 					final R4EUIPostponedAnomaly uiPostponedAnomaly = aUiPostponedContainer.getAnomalyContainer()
 							.createAnomaly(aUiReview, aOldAnomaly);
 					//Also add all child comments
-					final EList<Comment> comments = aOldAnomaly.getComments();
-					for (Comment comment : comments) {
+					final List<IComment> comments = aOldAnomaly.getComments();
+					for (IComment comment : comments) {
 						uiPostponedAnomaly.createComment((R4EComment) comment);
 					}
 				}
@@ -318,9 +317,9 @@ public class ImportPostponedHandler extends AbstractHandler {
 			foundUiAnomaly.updateAnomaly(aOldAnomaly);
 			if (foundUiAnomaly.isEnabled()) {
 				//Update anomaly comments
-				final EList<Comment> oldComments = aOldAnomaly.getComments();
+				final List<IComment> oldComments = aOldAnomaly.getComments();
 				final IR4EUIModelElement[] uiComments = foundUiAnomaly.getChildren();
-				for (Comment oldComment : oldComments) {
+				for (IComment oldComment : oldComments) {
 					R4EUIComment foundUiComment = null;
 					for (IR4EUIModelElement uiComment : uiComments) {
 						R4EComment comment = ((R4EUIComment) uiComment).getComment();
@@ -387,7 +386,7 @@ public class ImportPostponedHandler extends AbstractHandler {
 		if (null == foundUiAnomaly) {
 			if (aAddNewAnomalies) {
 				//If the anomaly is new and is postponed, add it
-				if (aOldAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED)) {
+				if (aOldAnomaly.getState().equals(R4EAnomalyState.DEFERRED)) {
 					if (null != aMonitor) {
 						aMonitor.subTask("Importing Postponed Anomaly for Review: " + aUiReview.getName());
 					}
@@ -396,8 +395,8 @@ public class ImportPostponedHandler extends AbstractHandler {
 							aUiReview.getReview().getName());
 
 					//Also add all child comments
-					final EList<Comment> comments = aOldAnomaly.getComments();
-					for (Comment comment : comments) {
+					final List<IComment> comments = aOldAnomaly.getComments();
+					for (IComment comment : comments) {
 						uiPostponedAnomaly.createComment((R4EComment) comment);
 					}
 				}
@@ -406,9 +405,9 @@ public class ImportPostponedHandler extends AbstractHandler {
 			foundUiAnomaly.updateAnomaly(aOldAnomaly);
 			if (foundUiAnomaly.isEnabled()) {
 				//Update anomaly comments
-				final EList<Comment> oldComments = aOldAnomaly.getComments();
+				final List<IComment> oldComments = aOldAnomaly.getComments();
 				final IR4EUIModelElement[] uiComments = foundUiAnomaly.getChildren();
-				for (Comment oldComment : oldComments) {
+				for (IComment oldComment : oldComments) {
 					R4EUIComment foundUiComment = null;
 					for (IR4EUIModelElement uiComment : uiComments) {
 						R4EComment comment = ((R4EUIComment) uiComment).getComment();
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
index b9c860b8..69b92269 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
@@ -75,7 +75,7 @@ public class NewChildElementHandler extends AbstractHandler {
 		//Get data from user
 		if (null != element) {
 			try {
-				final List<ReviewComponent> tempModelComponents = element.createChildModelDataElement();
+				final List<IReviewComponent> tempModelComponents = element.createChildModelDataElement();
 
 				//Create actual model element
 				final Job job = new Job(COMMAND_MESSAGE) {
@@ -91,7 +91,7 @@ public class NewChildElementHandler extends AbstractHandler {
 						R4EUIModelController.setJobInProgress(true);
 						monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
 
-						for (final ReviewComponent tempModelComponent : tempModelComponents) {
+						for (final IReviewComponent tempModelComponent : tempModelComponents) {
 							R4EUIPlugin.Ftracer.traceInfo("Adding child to element " + element.getName());
 							IR4EUIModelElement newElement = null;
 							try {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
index 389eaf00..d275aea5 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
@@ -422,8 +422,8 @@ public class NewReviewItemHandler extends AbstractHandler {
 		final List<R4EReviewComponent> addedItems = new ArrayList<R4EReviewComponent>();
 		addedItems.add(uiReviewItem.getItem());
 		final R4EReview review = uiReview.getReview();
-		if (review.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
-			if (((R4EFormalReview) review).getCurrent().getType().equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
+		if (review.getType().equals(R4EReviewType.FORMAL)) {
+			if (((R4EFormalReview) review).getCurrent().getType().equals(R4EReviewPhase.PREPARATION)) {
 				MailServicesProxy.sendItemsAddedNotification(addedItems);
 			}
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
index cab27edb..98f81783 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
@@ -80,7 +80,7 @@ public class NewRuleSetElementHandler extends AbstractHandler {
 				final IR4EUIModelElement element = R4EUIModelController.getRootElement();
 
 				//Get data from user
-				final ReviewComponent tempModelComponent = ((R4EUIRootElement) element).createRuleSetElement();
+				final IReviewComponent tempModelComponent = ((R4EUIRootElement) element).createRuleSetElement();
 				if (null != tempModelComponent) {
 					R4EUIPlugin.Ftracer.traceInfo("Adding Rule Set to the root element "); //$NON-NLS-1$
 
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
index d34a2b7e..dd8db4d1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
@@ -198,7 +198,7 @@ public class NextStateHandler extends AbstractHandler {
 			});
 			if (result[0] == Window.OK) {
 				final R4EAnomalyState newState = R4EUIAnomalyExtended.getStateFromString(dialog.getState());
-				if (newState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)) {
+				if (newState.equals(R4EAnomalyState.REJECTED)) {
 					final boolean commentResult = aAnomaly.createComment(true);
 					if (commentResult) {
 						UIUtils.changeAnomalyState(aAnomaly, newState);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
index 493912e3..827663ce 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
@@ -154,10 +154,10 @@ public class RemoveElementHandler extends AbstractHandler {
 
 					//Send email notification if needed
 					if (null != review) {
-						if (0 < removedItems.size() && review.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
+						if (0 < removedItems.size() && review.getType().equals(R4EReviewType.FORMAL)) {
 							if (((R4EFormalReview) review).getCurrent()
 									.getType()
-									.equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
+									.equals(R4EReviewPhase.PREPARATION)) {
 								try {
 									MailServicesProxy.sendItemsRemovedNotification(removedItems);
 								} catch (CoreException e) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
index 43b76dcf..33f5ca86 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
@@ -138,10 +138,10 @@ public class RestoreElementHandler extends AbstractHandler {
 
 					//Send email notification if needed
 					if (null != review) {
-						if (0 < addedItems.size() && review.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
+						if (0 < addedItems.size() && review.getType().equals(R4EReviewType.FORMAL)) {
 							if (((R4EFormalReview) review).getCurrent()
 									.getType()
-									.equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
+									.equals(R4EReviewPhase.PREPARATION)) {
 								try {
 									MailServicesProxy.sendItemsAddedNotification(addedItems);
 								} catch (CoreException e) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/CloneAnomalyPropertyTester.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/CloneAnomalyPropertyTester.java
index 7908c69d..e497e726 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/CloneAnomalyPropertyTester.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/CloneAnomalyPropertyTester.java
@@ -21,13 +21,13 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.commands.testers;
 import java.util.AbstractList;
 import java.util.AbstractSet;
 import java.util.Iterator;
+import java.util.List;
 
 import org.eclipse.compare.ITypedElement;
 import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jdt.core.ISourceReference;
 import org.eclipse.jface.text.TextSelection;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewState;
 import org.eclipse.mylyn.reviews.r4e.ui.R4EUIPlugin;
@@ -75,19 +75,19 @@ public class CloneAnomalyPropertyTester extends PropertyTester {
 
 		//Command is disabled if the active review is completed
 		if (((R4EReviewState) activeReview.getReview().getState()).getState().equals(
-				R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+				R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 
 		//Command is disabled if there is no anomaly available for cloning
-		EList<Topic> anomalies = activeReview.getReview().getTopics();
+		List<ITopic> anomalies = activeReview.getReview().getTopics();
 		if (anomalies.isEmpty()) {
 			return false;
 		}
 		boolean isLocalAnomalies = false;
 		int anomaliesSize = anomalies.size();
 		for (int i = 0; i < anomaliesSize; i++) {
-			if (!anomalies.get(i).getLocation().isEmpty()) {
+			if (!anomalies.get(i).getLocations().isEmpty()) {
 				isLocalAnomalies = true;
 				break;
 			}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/CompletedPropertyTester.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/CompletedPropertyTester.java
index 1c0731e4..de59b97a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/CompletedPropertyTester.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/CompletedPropertyTester.java
@@ -52,6 +52,6 @@ public class CompletedPropertyTester extends PropertyTester {
 			return false;
 		}
 		final R4EReviewPhase phase = ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState();
-		return !phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+		return !phase.equals(R4EReviewPhase.COMPLETED);
 	}
 }
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NewAnomalyPropertyTester.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NewAnomalyPropertyTester.java
index 3bc244be..6b73df56 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NewAnomalyPropertyTester.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NewAnomalyPropertyTester.java
@@ -73,7 +73,7 @@ public class NewAnomalyPropertyTester extends PropertyTester {
 
 		//Command is disabled if the active review is completed
 		if (((R4EReviewState) activeReview.getReview().getState()).getState().equals(
-				R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+				R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NewReviewItemPropertyTester.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NewReviewItemPropertyTester.java
index 94e33b14..246686e9 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NewReviewItemPropertyTester.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NewReviewItemPropertyTester.java
@@ -75,7 +75,7 @@ public class NewReviewItemPropertyTester extends PropertyTester {
 
 		//Command is disabled if the active review is completed
 		final R4EReviewPhase phase = ((R4EReviewState) activeReview.getReview().getState()).getState();
-		if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		if (phase.equals(R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NextStatePropertyTester.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NextStatePropertyTester.java
index 4d2781df..ed59f32b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NextStatePropertyTester.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/NextStatePropertyTester.java
@@ -84,12 +84,12 @@ public class NextStatePropertyTester extends PropertyTester {
 			} else if (aElement instanceof R4EUIReviewBasic) {
 				if (((R4EUIReviewBasic) aElement).isOpen()
 						&& ((R4EReviewState) ((R4EUIReviewBasic) aElement).getReview().getState()).getState().equals(
-								R4EReviewPhase.R4E_REVIEW_PHASE_STARTED)) {
+								R4EReviewPhase.STARTED)) {
 					return true;
 				}
 			} else if (aElement instanceof R4EUIAnomalyExtended) {
 				if (!((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState()
-						.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)
+						.equals(R4EReviewPhase.COMPLETED)
 						&& 0 < ((R4EUIAnomalyExtended) aElement).getNextAvailableStates().length) {
 					return true;
 				}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/PreviousStatePropertyTester.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/PreviousStatePropertyTester.java
index cc8e6239..28d8e349 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/PreviousStatePropertyTester.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/testers/PreviousStatePropertyTester.java
@@ -84,12 +84,12 @@ public class PreviousStatePropertyTester extends PropertyTester {
 			} else if (aElement instanceof R4EUIReviewBasic) {
 				if (((R4EUIReviewBasic) aElement).isOpen()
 						&& ((R4EReviewState) ((R4EUIReviewBasic) aElement).getReview().getState()).getState().equals(
-								R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+								R4EReviewPhase.COMPLETED)) {
 					return true;
 				}
 			} else if (aElement instanceof R4EUIAnomalyExtended) {
 				if (!((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState()
-						.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)
+						.equals(R4EReviewPhase.COMPLETED)
 						&& null != ((R4EUIAnomalyExtended) aElement).getPreviousState()) {
 					return true;
 				}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ParticipantInputDialog.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ParticipantInputDialog.java
index 0d3c600f..df967f9c 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ParticipantInputDialog.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ParticipantInputDialog.java
@@ -297,10 +297,10 @@ public class ParticipantInputDialog extends FormDialog implements IParticipantIn
 						if (R4EUIModelController.getActiveReview()
 								.getReview()
 								.getType()
-								.equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
-							newParticipant.getRoles().add(R4EUserRole.R4E_ROLE_LEAD);
+								.equals(R4EReviewType.BASIC)) {
+							newParticipant.getRoles().add(R4EUserRole.LEAD);
 						} else {
-							newParticipant.getRoles().add(R4EUserRole.R4E_ROLE_REVIEWER);
+							newParticipant.getRoles().add(R4EUserRole.REVIEWER);
 						}
 					}
 				}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ParticipantUnassignDialog.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ParticipantUnassignDialog.java
index 7ae7a224..c58f9e24 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ParticipantUnassignDialog.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ParticipantUnassignDialog.java
@@ -21,7 +21,6 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
@@ -209,7 +208,7 @@ public class ParticipantUnassignDialog extends FormDialog implements IParticipan
 		});
 
 		//Populate table
-		EList<String> assignedParticipants = null;
+		List<String> assignedParticipants = null;
 		if (fElement instanceof R4EUIReviewItem) {
 			assignedParticipants = ((R4EUIReviewItem) fElement).getItem().getAssignedTo();
 		} else if (fElement instanceof R4EUIFileContext) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/R4EInputValidator.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/R4EInputValidator.java
index 6124a2ef..70aa2e35 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/R4EInputValidator.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/R4EInputValidator.java
@@ -22,7 +22,7 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs;
 import java.io.File;
 
 import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
+import org.eclipse.mylyn.reviews.core.model.IReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.utils.WildcardFileFilter;
@@ -148,7 +148,7 @@ public class R4EInputValidator implements IInputValidator {
 	 * @return String
 	 */
 	public String isReviewExists(String aReviewName, R4EUIReviewGroup aParentGroup) { // $codepro.audit.disable booleanMethodNamingConvention	
-		for (Review review : aParentGroup.getReviewGroup().getReviews()) {
+		for (IReview review : aParentGroup.getReviewGroup().getReviews()) {
 			if (((R4EReview) review).getName().equalsIgnoreCase(aReviewName)) {
 				return REVIEW_EXISTS_VALIDATION_ERROR_MESSAGE;
 			}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ReviewInputDialog.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ReviewInputDialog.java
index dc6c4360..354ddaad 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ReviewInputDialog.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ReviewInputDialog.java
@@ -23,10 +23,10 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IInputValidator;
@@ -273,11 +273,11 @@ public class ReviewInputDialog extends FormDialog implements IReviewInputDialog
 		if (buttonId == IDialogConstants.OK_ID) {
 			//Review type (no validation needed as this is a read-only combo box
 			if (fReviewType.getText().equals(R4EUIConstants.REVIEW_TYPE_FORMAL)) {
-				fReviewTypeValue = R4EReviewType.R4E_REVIEW_TYPE_FORMAL;
+				fReviewTypeValue = R4EReviewType.FORMAL;
 			} else if (fReviewType.getText().equals(R4EUIConstants.REVIEW_TYPE_INFORMAL)) {
-				fReviewTypeValue = R4EReviewType.R4E_REVIEW_TYPE_INFORMAL;
+				fReviewTypeValue = R4EReviewType.INFORMAL;
 			} else if (fReviewType.getText().equals(R4EUIConstants.REVIEW_TYPE_BASIC)) {
-				fReviewTypeValue = R4EReviewType.R4E_REVIEW_TYPE_BASIC;
+				fReviewTypeValue = R4EReviewType.BASIC;
 			} else {
 				//Validation of input failed
 				final ErrorDialog dialog = new ErrorDialog(null, R4EUIConstants.DIALOG_TITLE_ERROR,
@@ -576,7 +576,7 @@ public class ReviewInputDialog extends FormDialog implements IReviewInputDialog
 		label.setToolTipText(R4EUIConstants.REVIEW_PROJECT_TOOLTIP);
 		label.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
 		fProjectsCombo = new CCombo(extraSectionClient, SWT.BORDER | SWT.READ_ONLY);
-		EList<String> availableProjects = parentGroup.getReviewGroup().getAvailableProjects();
+		List<String> availableProjects = parentGroup.getReviewGroup().getAvailableProjects();
 		final String[] projects = availableProjects.toArray(new String[availableProjects.size()]);
 		if (0 == projects.length) {
 			fProjectsCombo.setEnabled(false);
@@ -595,7 +595,7 @@ public class ReviewInputDialog extends FormDialog implements IReviewInputDialog
 		label = toolkit.createLabel(extraSectionClient, ADD_REVIEW_COMPONENTS_DIALOG_VALUE);
 		label.setToolTipText(R4EUIConstants.REVIEW_COMPONENTS_TOOLTIP);
 		label.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-		EList<String> componentsList = parentGroup.getReviewGroup().getAvailableComponents();
+		List<String> componentsList = parentGroup.getReviewGroup().getAvailableComponents();
 		final String[] components = componentsList.toArray(new String[componentsList.size()]);
 		textGridData = new GridData(GridData.FILL, GridData.FILL, true, false);
 		textGridData.horizontalSpan = 3;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AnomaliesMyFilter.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AnomaliesMyFilter.java
index 1c3135bf..f99aec86 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AnomaliesMyFilter.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AnomaliesMyFilter.java
@@ -75,7 +75,7 @@ public class AnomaliesMyFilter extends ViewerFilter {
 
 		//For basic reviews, show all anomalies, For other review types, only show anomalies created by us
 		if (aElement instanceof R4EUIAnomalyExtended) {
-			if (!(((R4EUIAnomalyBasic) aElement).getAnomaly().getUser().getId().equals(R4EUIModelController.getReviewer()))) {
+			if (!(((R4EUIAnomalyBasic) aElement).getAnomaly().getAuthor().getId().equals(R4EUIModelController.getReviewer()))) {
 				return false;
 			}
 		} else if (aElement instanceof R4EUIAnomalyBasic) {
@@ -101,7 +101,7 @@ public class AnomaliesMyFilter extends ViewerFilter {
 			final int length = aCurrentElement.getChildren().length;
 			for (int i = 0; i < length; i++) {
 				if (((R4EUIAnomalyBasic) aCurrentElement.getChildren()[i]).getAnomaly()
-						.getUser()
+						.getAuthor()
 						.getId()
 						.equals(R4EUIModelController.getReviewer())) {
 					return true;
@@ -110,7 +110,7 @@ public class AnomaliesMyFilter extends ViewerFilter {
 			return false;
 		} else if (aCurrentElement instanceof R4EUIAnomalyBasic) {
 			if (((R4EUIAnomalyBasic) aCurrentElement).getAnomaly()
-					.getUser()
+					.getAuthor()
 					.getId()
 					.equals(R4EUIModelController.getReviewer())) {
 				return true;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AssignParticipantFilter.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AssignParticipantFilter.java
index 127ae073..d656da8a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AssignParticipantFilter.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AssignParticipantFilter.java
@@ -144,7 +144,7 @@ public class AssignParticipantFilter extends ViewerFilter {
 		} else if (aElement instanceof R4EUIAnomalyBasic) {
 			if (0 == ((R4EUIAnomalyBasic) aElement).getAnomaly().getAssignedTo().size()
 					|| ((R4EUIAnomalyBasic) aElement).getAnomaly().getAssignedTo().contains(fParticipant)
-					|| ((R4EUIAnomalyBasic) aElement).getAnomaly().getUser().getId().equals(fParticipant)) {
+					|| ((R4EUIAnomalyBasic) aElement).getAnomaly().getAuthor().getId().equals(fParticipant)) {
 				return true;
 			}
 			return false;
@@ -160,7 +160,7 @@ public class AssignParticipantFilter extends ViewerFilter {
 			for (IR4EUIModelElement child : ((R4EUIAnomalyContainer) aElement).getChildren()) {
 				if (0 == ((R4EUIAnomalyBasic) child).getAnomaly().getAssignedTo().size()
 						|| ((R4EUIAnomalyBasic) child).getAnomaly().getAssignedTo().contains(fParticipant)
-						|| ((R4EUIAnomalyBasic) child).getAnomaly().getUser().getId().equals(fParticipant)) {
+						|| ((R4EUIAnomalyBasic) child).getAnomaly().getAuthor().getId().equals(fParticipant)) {
 					return true;
 				}
 			}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/ReviewCompletedFilter.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/ReviewCompletedFilter.java
index 76049a5f..e4d943de 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/ReviewCompletedFilter.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/ReviewCompletedFilter.java
@@ -76,7 +76,7 @@ public class ReviewCompletedFilter extends ViewerFilter {
 			if (!(element instanceof R4EUIReviewBasic)) {
 				return false;
 			}
-			if (!(((R4EReviewState) ((R4EUIReviewBasic) element).getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))
+			if (!(((R4EReviewState) ((R4EUIReviewBasic) element).getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))
 					|| ((R4EUIReviewBasic) element).isOpen()) {
 				return true;
 			}
@@ -101,7 +101,7 @@ public class ReviewCompletedFilter extends ViewerFilter {
 				return false;
 			}
 		}
-		if (!(((R4EReviewState) ((R4EUIReviewBasic) reviewParentElement).getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))
+		if (!(((R4EReviewState) ((R4EUIReviewBasic) reviewParentElement).getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))
 				|| ((R4EUIReviewBasic) reviewParentElement).isOpen()) {
 			return true;
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/IR4EUIModelElement.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/IR4EUIModelElement.java
index 94f2791b..fe391816 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/IR4EUIModelElement.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/IR4EUIModelElement.java
@@ -22,7 +22,7 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 import java.io.FileNotFoundException;
 import java.util.List;
 
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
@@ -262,7 +262,7 @@ public interface IR4EUIModelElement {
 	 * @return the new serialization elements objects
 	 * @throws ResourceHandlingException
 	 */
-	List<ReviewComponent> createChildModelDataElement() throws ResourceHandlingException;
+	List<IReviewComponent> createChildModelDataElement() throws ResourceHandlingException;
 
 	/**
 	 * Set serialization model data by copying it from the passed-in object
@@ -272,7 +272,7 @@ public interface IR4EUIModelElement {
 	 * @throws ResourceHandlingException
 	 * @throws OutOfSyncException
 	 */
-	void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException;
+	void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException;
 
 	//Properties
 
@@ -314,7 +314,7 @@ public interface IR4EUIModelElement {
 	 * @throws OutOfSyncException
 	 * @throws CompatibilityException
 	 */
-	IR4EUIModelElement createChildren(ReviewComponent tempModelComponent) throws ResourceHandlingException,
+	IR4EUIModelElement createChildren(IReviewComponent tempModelComponent) throws ResourceHandlingException,
 			OutOfSyncException, CompatibilityException;
 
 	/**
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyBasic.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyBasic.java
index 1843744d..1fd8c096 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyBasic.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyBasic.java
@@ -33,8 +33,8 @@ import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IComment;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ECommentType;
@@ -283,9 +283,9 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildModelDataElement()
 	 */
 	@Override
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//Get Comment from user and set it in model data
-		final List<ReviewComponent> tempComments = new ArrayList<ReviewComponent>();
+		final List<IReviewComponent> tempComments = new ArrayList<IReviewComponent>();
 		R4EUIModelController.setJobInProgress(true);
 
 		final ICommentInputDialog dialog = R4EUIDialogFactory.getInstance().getCommentInputDialog();
@@ -309,7 +309,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#setModelData(R4EReviewComponent)
 	 */
 	@Override
-	public void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
+	public void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
 
 		//Set data in model element
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fAnomaly,
@@ -334,7 +334,8 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 	 * @throws ResourceHandlingException
 	 * @throws OutOfSyncException
 	 */
-	public void setExtraModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
+	public void setExtraModelData(IReviewComponent aModelComponent) throws ResourceHandlingException,
+			OutOfSyncException {
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fAnomaly,
 				R4EUIModelController.getReviewer());
 		fAnomaly.setDueDate(((R4EAnomaly) aModelComponent).getDueDate());
@@ -384,7 +385,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 	 * @return String - the new tooltip
 	 */
 	public static String buildAnomalyToolTip(R4EAnomaly aAnomaly) {
-		return aAnomaly.getUser().getId() + ": " + aAnomaly.getDescription();
+		return aAnomaly.getAuthor().getId() + ": " + aAnomaly.getDescription();
 	}
 
 	/**
@@ -468,7 +469,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 	 */
 	@Override
 	public void open() {
-		final List<Comment> comments = fAnomaly.getComments();
+		final List<IComment> comments = fAnomaly.getComments();
 		if (null != comments) {
 			R4EComment r4eComment = null;
 			final int commentsSize = comments.size();
@@ -509,7 +510,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(R4EReviewComponent)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException, CompatibilityException {
 		final String user = R4EUIModelController.getReviewer();
 		R4EParticipant participant = null;
@@ -522,7 +523,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 		}
 		final R4EComment comment = R4EUIModelController.FModelExt.createR4EComment(participant, fAnomaly);
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(comment, R4EUIModelController.getReviewer());
-		comment.setDescription(((Comment) aModelComponent).getDescription());
+		comment.setDescription(((IComment) aModelComponent).getDescription());
 		R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 		final R4EUIComment addedChild = new R4EUIComment(this, comment);
 		addChildren(addedChild);
@@ -705,7 +706,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))
 				&& getParent().getParent() instanceof R4EUIFileContext) {
 			return true;
 		}
@@ -745,7 +746,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			//We can only paste if there is a least 1 Comment in the clipboard
 			Object element = null;
 			ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
@@ -794,7 +795,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -833,7 +834,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -873,8 +874,8 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 			return false;
 		}
 		R4EReviewPhase phase = ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState();
-		if (isEnabled() || isReadOnly() || phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)
-				|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
+		if (isEnabled() || isReadOnly() || phase.equals(R4EReviewPhase.COMPLETED)
+				|| phase.equals(R4EReviewPhase.REWORK)) {
 			return false;
 		}
 		return true;
@@ -997,7 +998,7 @@ public class R4EUIAnomalyBasic extends R4EUIModelElement {
 						element = getParent().getParent();
 					}
 					if (!((R4EReviewState) ((R4EUIReviewBasic) element).getReview().getState()).getState().equals(
-							R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+							R4EReviewPhase.COMPLETED)) {
 						return true;
 					}
 				}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyContainer.java
index 774b60f6..4439dce7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyContainer.java
@@ -29,13 +29,12 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
+import org.eclipse.mylyn.reviews.core.model.ILocation;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
@@ -214,9 +213,9 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildModelDataElement()
 	 */
 	@Override
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//Get Anomaly from user and set it in model data
-		final List<ReviewComponent> tempAnomalies = new ArrayList<ReviewComponent>();
+		final List<IReviewComponent> tempAnomalies = new ArrayList<IReviewComponent>();
 		R4EUIModelController.setJobInProgress(true);
 
 		final IAnomalyInputDialog dialog = R4EUIDialogFactory.getInstance().getNewAnomalyInputDialog();
@@ -305,18 +304,18 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 						|| R4EUIPlugin.getDefault()
 								.getPreferenceStore()
 								.getBoolean(PreferenceConstants.P_SHOW_DISABLED)) {
-					//Do not set position for global EList<E>lies
+					//Do not set position for global List<E>lies
 					position = null;
-					EList<Location> locations = anomalies.get(i).getLocation(); // $codepro.audit.disable variableDeclaredInLoop
+					List<ILocation> locations = anomalies.get(i).getLocations(); // $codepro.audit.disable variableDeclaredInLoop
 					if (null != locations) {
 						if (null != locations.get(0)) {
 							int locationsSize = locations.size(); // $codepro.audit.disable variableDeclaredInLoop
 							for (int j = 0; j < locationsSize; j++) {
 								position = new R4EUITextPosition(
-										((R4EContent) anomalies.get(i).getLocation().get(j)).getLocation()); // $codepro.audit.disable methodChainLength
+										((R4EContent) anomalies.get(i).getLocations().get(j)).getLocation()); // $codepro.audit.disable methodChainLength
 								if (((R4EUIReviewBasic) getParent().getParent().getParent()).getReview()
 										.getType()
-										.equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+										.equals(R4EReviewType.BASIC)) {
 									uiAnomaly = new R4EUIAnomalyBasic(this, anomalies.get(i), position);
 								} else {
 									uiAnomaly = new R4EUIAnomalyExtended(this, anomalies.get(i), position);
@@ -341,7 +340,7 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 			}
 		} else if (parentElement instanceof R4EUIReviewBasic) {
 			//Get anomalies that do not have any location.  These are global anomalies
-			final EList<Topic> anomalies = ((R4EUIReviewBasic) parentElement).getReview().getTopics();
+			final List<ITopic> anomalies = ((R4EUIReviewBasic) parentElement).getReview().getTopics();
 			if (null != anomalies) {
 				final int anomaliesSize = anomalies.size();
 				R4EAnomaly anomaly = null;
@@ -355,10 +354,10 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 							|| R4EUIPlugin.getDefault()
 									.getPreferenceStore()
 									.getBoolean(PreferenceConstants.P_SHOW_DISABLED)) {
-						if (0 == anomaly.getLocation().size()) {
+						if (0 == anomaly.getLocations().size()) {
 							if (((R4EUIReviewBasic) getParent()).getReview()
 									.getType()
-									.equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+									.equals(R4EReviewType.BASIC)) {
 								uiAnomaly = new R4EUIAnomalyBasic(this, anomaly, null);
 							} else {
 								uiAnomaly = new R4EUIAnomalyExtended(this, anomaly, null);
@@ -432,7 +431,7 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(ReviewNavigatorContentProvider)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException {
 		final String user = R4EUIModelController.getReviewer();
 		final R4EAnomaly anomaly = R4EUIModelController.FModelExt.createR4EAnomaly(R4EUIModelController.getActiveReview()
@@ -441,17 +440,17 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 		anomaly.setTitle(((R4EAnomaly) aModelComponent).getTitle()); //This is needed as the global anomaly title is displayed in the navigator view
 		R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 		R4EUIAnomalyBasic addedChild = null;
-		if (R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+		if (R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.BASIC)) {
 			addedChild = new R4EUIAnomalyBasic(this, anomaly, null);
 		} else {
 			addedChild = new R4EUIAnomalyExtended(this, anomaly, null);
 			if (R4EUIModelController.getActiveReview()
 					.getReview()
 					.getType()
-					.equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
-				((R4EUIAnomalyExtended) addedChild).updateState(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED);
-			} else { //R4EReviewType.R4E_REVIEW_TYPE_INFORMAL
-				((R4EUIAnomalyExtended) addedChild).updateState(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED);
+					.equals(R4EReviewType.FORMAL)) {
+				((R4EUIAnomalyExtended) addedChild).updateState(R4EAnomalyState.CREATED);
+			} else { //R4EReviewType.INFORMAL
+				((R4EUIAnomalyExtended) addedChild).updateState(R4EAnomalyState.ASSIGNED);
 			}
 		}
 		addedChild.setModelData(aModelComponent);
@@ -666,14 +665,14 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 		R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 
 		//Create and set UI model element
-		if (uiReview.getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+		if (uiReview.getReview().getType().equals(R4EReviewType.BASIC)) {
 			uiAnomaly = new R4EUIAnomalyBasic(this, aAnomaly, aUiPosition);
 		} else {
 			uiAnomaly = new R4EUIAnomalyExtended(this, aAnomaly, aUiPosition);
-			if (uiReview.getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
-				((R4EUIAnomalyExtended) uiAnomaly).updateState(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED);
-			} else { //R4EReviewType.R4E_REVIEW_TYPE_INFORMAL
-				((R4EUIAnomalyExtended) uiAnomaly).updateState(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED);
+			if (uiReview.getReview().getType().equals(R4EReviewType.FORMAL)) {
+				((R4EUIAnomalyExtended) uiAnomaly).updateState(R4EAnomalyState.CREATED);
+			} else { //R4EReviewType.INFORMAL
+				((R4EUIAnomalyExtended) uiAnomaly).updateState(R4EAnomalyState.ASSIGNED);
 			}
 		}
 		aUiPosition.setPositionInModel(position);
@@ -761,7 +760,7 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 	public boolean isNewChildElementCmd() {
 		if (!isReadOnly()
 				&& !((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) && getParent().isEnabled()
+						R4EReviewPhase.COMPLETED) && getParent().isEnabled()
 				&& getParent() instanceof R4EUIReviewBasic) {
 			return true;
 		}
@@ -815,19 +814,19 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 			//Test if the anomaly is disabled or not
 			if (anomaly.isEnabled()) {
 				//Anomaly is not disabled, should test for the completion
-				if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED)) {
+				if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.CREATED)) {
 					sb.append("Anomaly (" + anomaly.getAnomaly().getTitle() + ") is in state CREATED"
 							+ R4EUIConstants.LINE_FEED);
 					resultOk = false;
-				} else if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED)) {
+				} else if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.ASSIGNED)) {
 					sb.append("Anomaly (" + anomaly.getAnomaly().getTitle() + ") is in state ASSIGNED"
 							+ R4EUIConstants.LINE_FEED);
 					resultOk = false;
-				} else if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED)) {
+				} else if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.ACCEPTED)) {
 					sb.append("Anomaly (" + anomaly.getAnomaly().getTitle() + ") is in state ACCEPTED"
 							+ R4EUIConstants.LINE_FEED);
 					resultOk = false;
-				} else if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED)) {
+				} else if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.FIXED)) {
 					if (null == anomaly.getAnomaly().getFixedByID() || ("").equals(anomaly.getAnomaly().getFixedByID())) {
 						sb.append("Anomaly (" + anomaly.getAnomaly().getTitle() + ") does not have a fixer"
 								+ R4EUIConstants.LINE_FEED);
@@ -837,12 +836,12 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 							.getReview()
 							.getDecision()
 							.getValue()
-							.equals(R4EDecision.R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP)) {
+							.equals(R4EDecision.ACCEPTED_FOLLOWUP)) {
 						sb.append("Anomaly (" + anomaly.getAnomaly().getTitle() + ") is in state FIXED, but Review"
 								+ " Decision is set to Accepted with Followup" + R4EUIConstants.LINE_FEED);
 						resultOk = false;
 					}
-				} else if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED)) {
+				} else if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.VERIFIED)) {
 					if (null == anomaly.getAnomaly().getFollowUpByID()
 							|| ("").equals(anomaly.getAnomaly().getFollowUpByID())) {
 						sb.append("Anomaly (" + anomaly.getAnomaly().getTitle() + ") is in state VERIFIED and "
@@ -873,7 +872,7 @@ public class R4EUIAnomalyContainer extends R4EUIModelElement {
 			//Test if the anomaly is disabled or not
 			if (anomaly.isEnabled()) {
 				//Anomaly is not disabled, should test for the next state REWORK
-				if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED)) {
+				if (anomaly.getAnomaly().getState().equals(R4EAnomalyState.CREATED)) {
 					sb.append("Anomaly (" + anomaly.getAnomaly().getTitle() + ") is in state CREATED"
 							+ R4EUIConstants.LINE_FEED);
 					resultOk = false;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyExtended.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyExtended.java
index c7777104..ed2b6b7e 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyExtended.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIAnomalyExtended.java
@@ -182,8 +182,7 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fAnomaly,
 				R4EUIModelController.getReviewer());
 		fAnomaly.setState(aNewState);
-		if (fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED)
-				|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED)) {
+		if (fAnomaly.getState().equals(R4EAnomalyState.FIXED) || fAnomaly.getState().equals(R4EAnomalyState.VERIFIED)) {
 			if (getParent().getParent() instanceof R4EUIFileContext) {
 				fAnomaly.setFixedInVersion(((R4EUIFileContext) getParent().getParent()).getTargetFileVersion());
 			} else if (getParent() instanceof R4EUIPostponedFile) {
@@ -208,14 +207,12 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 	 *            R4EAnomalyState
 	 */
 	private void updateDecider(R4EAnomalyState aNewState) {
-		if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED)
-				|| aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED)
-				|| aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED)
-				|| aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)) {
+		if (aNewState.equals(R4EAnomalyState.ACCEPTED) || aNewState.equals(R4EAnomalyState.DEFERRED)
+				|| aNewState.equals(R4EAnomalyState.DUPLICATED) || aNewState.equals(R4EAnomalyState.REJECTED)) {
 			fAnomaly.setDecidedByID(R4EUIModelController.getReviewer());
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED)) {
+		} else if (aNewState.equals(R4EAnomalyState.FIXED)) {
 			fAnomaly.setFixedByID(R4EUIModelController.getReviewer());
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED)) {
+		} else if (aNewState.equals(R4EAnomalyState.VERIFIED)) {
 			fAnomaly.setFollowUpByID(R4EUIModelController.getReviewer());
 		}
 	}
@@ -304,21 +301,21 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 	 * @return String
 	 */
 	public static String getStateString(R4EAnomalyState aNewState) {
-		if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED)) {
+		if (aNewState.equals(R4EAnomalyState.CREATED)) {
 			return ANOMALY_STATE_CREATED;
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED)) {
+		} else if (aNewState.equals(R4EAnomalyState.ASSIGNED)) {
 			return ANOMALY_STATE_ASSIGNED;
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED)) {
+		} else if (aNewState.equals(R4EAnomalyState.ACCEPTED)) {
 			return ANOMALY_STATE_ACCEPTED;
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED)) {
+		} else if (aNewState.equals(R4EAnomalyState.DUPLICATED)) {
 			return ANOMALY_STATE_DUPLICATED;
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)) {
+		} else if (aNewState.equals(R4EAnomalyState.REJECTED)) {
 			return ANOMALY_STATE_REJECTED;
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED)) {
+		} else if (aNewState.equals(R4EAnomalyState.DEFERRED)) {
 			return ANOMALY_STATE_POSTPONED;
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED)) {
+		} else if (aNewState.equals(R4EAnomalyState.FIXED)) {
 			return ANOMALY_STATE_FIXED;
-		} else if (aNewState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED)) {
+		} else if (aNewState.equals(R4EAnomalyState.VERIFIED)) {
 			return ANOMALY_STATE_VERIFIED;
 		} else {
 			return "";
@@ -334,21 +331,21 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 	 */
 	public static R4EAnomalyState getStateFromString(String aNewState) {
 		if (aNewState.equals(ANOMALY_STATE_CREATED)) {
-			return R4EAnomalyState.R4E_ANOMALY_STATE_CREATED;
+			return R4EAnomalyState.CREATED;
 		} else if (aNewState.equals(ANOMALY_STATE_ASSIGNED)) {
-			return R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED;
+			return R4EAnomalyState.ASSIGNED;
 		} else if (aNewState.equals(ANOMALY_STATE_ACCEPTED)) {
-			return R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED;
+			return R4EAnomalyState.ACCEPTED;
 		} else if (aNewState.equals(ANOMALY_STATE_DUPLICATED)) {
-			return R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED;
+			return R4EAnomalyState.DUPLICATED;
 		} else if (aNewState.equals(ANOMALY_STATE_REJECTED)) {
-			return R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED;
+			return R4EAnomalyState.REJECTED;
 		} else if (aNewState.equals(ANOMALY_STATE_POSTPONED)) {
-			return R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED;
+			return R4EAnomalyState.DEFERRED;
 		} else if (aNewState.equals(ANOMALY_STATE_FIXED)) {
-			return R4EAnomalyState.R4E_ANOMALY_STATE_FIXED;
+			return R4EAnomalyState.FIXED;
 		} else if (aNewState.equals(ANOMALY_STATE_VERIFIED)) {
-			return R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED;
+			return R4EAnomalyState.VERIFIED;
 		} else {
 			return null; //should never happen
 		}
@@ -402,75 +399,68 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 		final R4EAnomalyState currentState = getAnomaly().getState();
 
 		if (null != R4EUIModelController.getActiveReview()) {
-			if (R4EUIModelController.getActiveReview()
-					.getReview()
-					.getType()
-					.equals(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL)) {
+			if (R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.INFORMAL)) {
 				switch (currentState.getValue()) {
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED_VALUE:
-					return R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED;
+				case R4EAnomalyState.DEFERRED_VALUE:
+					return R4EAnomalyState.ASSIGNED;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED_VALUE:
-					return R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED;
+				case R4EAnomalyState.DUPLICATED_VALUE:
+					return R4EAnomalyState.ASSIGNED;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED_VALUE:
-					return R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED;
+				case R4EAnomalyState.REJECTED_VALUE:
+					return R4EAnomalyState.ASSIGNED;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_FIXED_VALUE:
-					return R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED;
+				case R4EAnomalyState.FIXED_VALUE:
+					return R4EAnomalyState.ASSIGNED;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED_VALUE:
-					return R4EAnomalyState.R4E_ANOMALY_STATE_FIXED;
+				case R4EAnomalyState.VERIFIED_VALUE:
+					return R4EAnomalyState.FIXED;
 
 				default:
 					return null;
 				}
-			} else { //R4EReviewType.R4E_REVIEW_TYPE_FORMAL
+			} else { //R4EReviewType.FORMAL
 				final R4EReviewPhase phase = ((R4EFormalReview) R4EUIModelController.getActiveReview().getReview()).getCurrent()
 						.getType();
 				switch (currentState.getValue()) {
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						return R4EAnomalyState.R4E_ANOMALY_STATE_CREATED;
+				case R4EAnomalyState.DEFERRED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION) || phase.equals(R4EReviewPhase.REWORK)) {
+						return R4EAnomalyState.CREATED;
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						return R4EAnomalyState.R4E_ANOMALY_STATE_CREATED;
+				case R4EAnomalyState.DUPLICATED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION) || phase.equals(R4EReviewPhase.REWORK)) {
+						return R4EAnomalyState.CREATED;
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						return R4EAnomalyState.R4E_ANOMALY_STATE_CREATED;
+				case R4EAnomalyState.REJECTED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION) || phase.equals(R4EReviewPhase.REWORK)) {
+						return R4EAnomalyState.CREATED;
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						return R4EAnomalyState.R4E_ANOMALY_STATE_CREATED;
+				case R4EAnomalyState.ACCEPTED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION) || phase.equals(R4EReviewPhase.REWORK)) {
+						return R4EAnomalyState.CREATED;
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_FIXED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)) {
-						return R4EAnomalyState.R4E_ANOMALY_STATE_CREATED;
+				case R4EAnomalyState.FIXED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION)) {
+						return R4EAnomalyState.CREATED;
 					}
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						return R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED;
+					if (phase.equals(R4EReviewPhase.REWORK)) {
+						return R4EAnomalyState.ACCEPTED;
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						return R4EAnomalyState.R4E_ANOMALY_STATE_FIXED;
+				case R4EAnomalyState.VERIFIED_VALUE:
+					if (phase.equals(R4EReviewPhase.REWORK)) {
+						return R4EAnomalyState.FIXED;
 					}
 					break;
 
@@ -509,30 +499,27 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 	 */
 	public boolean isDecidedByEnabled() {
 		if (null != R4EUIModelController.getActiveReview()) {
-			if (R4EUIModelController.getActiveReview()
-					.getReview()
-					.getType()
-					.equals(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL)) {
-				if (fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED)
-						|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED)
-						|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)
-						|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED)
-						|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED)) {
+			if (R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.INFORMAL)) {
+				if (fAnomaly.getState().equals(R4EAnomalyState.DEFERRED)
+						|| fAnomaly.getState().equals(R4EAnomalyState.DUPLICATED)
+						|| fAnomaly.getState().equals(R4EAnomalyState.REJECTED)
+						|| fAnomaly.getState().equals(R4EAnomalyState.FIXED)
+						|| fAnomaly.getState().equals(R4EAnomalyState.VERIFIED)) {
 					return true;
 				}
-			} else { //R4EReviewType.R4E_REVIEW_TYPE_FORMAL
+			} else { //R4EReviewType.FORMAL
 				final R4EReviewPhase phase = ((R4EFormalReview) R4EUIModelController.getActiveReview().getReview()).getCurrent()
 						.getType();
-				if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)) {
-					if (fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED)
-							|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED)
-							|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)
-							|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED)) {
+				if (phase.equals(R4EReviewPhase.DECISION)) {
+					if (fAnomaly.getState().equals(R4EAnomalyState.DEFERRED)
+							|| fAnomaly.getState().equals(R4EAnomalyState.DUPLICATED)
+							|| fAnomaly.getState().equals(R4EAnomalyState.REJECTED)
+							|| fAnomaly.getState().equals(R4EAnomalyState.ACCEPTED)) {
 						return true;
 					}
-				} else if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-					if (fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED)
-							|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED)) {
+				} else if (phase.equals(R4EReviewPhase.REWORK)) {
+					if (fAnomaly.getState().equals(R4EAnomalyState.FIXED)
+							|| fAnomaly.getState().equals(R4EAnomalyState.VERIFIED)) {
 						return true;
 					}
 				}
@@ -547,8 +534,7 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 	 * @return boolean
 	 */
 	public boolean isFixedByEnabled() {
-		if (fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED)
-				|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED)) {
+		if (fAnomaly.getState().equals(R4EAnomalyState.FIXED) || fAnomaly.getState().equals(R4EAnomalyState.VERIFIED)) {
 			return true;
 		}
 		return false;
@@ -560,8 +546,7 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 	 * @return boolean
 	 */
 	public boolean isFollowUpByEnabled() {
-		if (fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED)
-				|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED)) {
+		if (fAnomaly.getState().equals(R4EAnomalyState.VERIFIED) || fAnomaly.getState().equals(R4EAnomalyState.FIXED)) {
 			return true;
 		}
 		return false;
@@ -573,7 +558,7 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 	 * @return boolean
 	 */
 	public boolean isNotAcceptedReasonEnabled() {
-		if (fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)) {
+		if (fAnomaly.getState().equals(R4EAnomalyState.REJECTED)) {
 			return true;
 		}
 		return false;
@@ -604,142 +589,132 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 		final List<R4EAnomalyState> states = new ArrayList<R4EAnomalyState>();
 
 		if (null != R4EUIModelController.getActiveReview()) {
-			if (R4EUIModelController.getActiveReview()
-					.getReview()
-					.getType()
-					.equals(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL)) {
+			if (R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.INFORMAL)) {
 				switch (aCurrentState.getValue()) {
-				case R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
+				case R4EAnomalyState.ASSIGNED_VALUE:
+					states.add(R4EAnomalyState.ASSIGNED);
+					states.add(R4EAnomalyState.DEFERRED);
+					states.add(R4EAnomalyState.DUPLICATED);
+					states.add(R4EAnomalyState.REJECTED);
+					states.add(R4EAnomalyState.FIXED);
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
+				case R4EAnomalyState.DEFERRED_VALUE:
+					states.add(R4EAnomalyState.ASSIGNED);
+					states.add(R4EAnomalyState.DEFERRED);
+					states.add(R4EAnomalyState.DUPLICATED);
+					states.add(R4EAnomalyState.REJECTED);
+					states.add(R4EAnomalyState.FIXED);
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
+				case R4EAnomalyState.DUPLICATED_VALUE:
+					states.add(R4EAnomalyState.ASSIGNED);
+					states.add(R4EAnomalyState.DEFERRED);
+					states.add(R4EAnomalyState.DUPLICATED);
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
+				case R4EAnomalyState.REJECTED_VALUE:
+					states.add(R4EAnomalyState.ASSIGNED);
+					states.add(R4EAnomalyState.DEFERRED);
+					states.add(R4EAnomalyState.REJECTED);
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_FIXED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED);
+				case R4EAnomalyState.FIXED_VALUE:
+					states.add(R4EAnomalyState.ASSIGNED);
+					states.add(R4EAnomalyState.FIXED);
+					states.add(R4EAnomalyState.VERIFIED);
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED);
+				case R4EAnomalyState.VERIFIED_VALUE:
+					states.add(R4EAnomalyState.FIXED);
+					states.add(R4EAnomalyState.VERIFIED);
 					break;
 
 				default:
 					//should never happen
 				}
-			} else if (R4EUIModelController.getActiveReview()
-					.getReview()
-					.getType()
-					.equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) { //R4EReviewType.R4E_REVIEW_TYPE_FORMAL
+			} else if (R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.FORMAL)) { //R4EReviewType.FORMAL
 				final R4EReviewPhase phase = ((R4EFormalReview) R4EUIModelController.getActiveReview().getReview()).getCurrent()
 						.getType();
 				switch (aCurrentState.getValue()) {
-				case R4EAnomalyState.R4E_ANOMALY_STATE_CREATED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
+				case R4EAnomalyState.CREATED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION) || phase.equals(R4EReviewPhase.REWORK)) {
+						states.add(R4EAnomalyState.CREATED);
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.DEFERRED);
+						states.add(R4EAnomalyState.DUPLICATED);
+						states.add(R4EAnomalyState.REJECTED);
 					} else {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
+						states.add(R4EAnomalyState.CREATED);
+						states.add(R4EAnomalyState.DUPLICATED);
+						states.add(R4EAnomalyState.REJECTED);
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
+				case R4EAnomalyState.DEFERRED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION) || phase.equals(R4EReviewPhase.REWORK)) {
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.DUPLICATED);
+						states.add(R4EAnomalyState.REJECTED);
+						states.add(R4EAnomalyState.DEFERRED);
 					} else {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
+						states.add(R4EAnomalyState.DEFERRED);
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
+				case R4EAnomalyState.DUPLICATED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION) || phase.equals(R4EReviewPhase.REWORK)) {
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.DEFERRED);
+						states.add(R4EAnomalyState.DUPLICATED);
 					} else {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
+						states.add(R4EAnomalyState.DUPLICATED);
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
+				case R4EAnomalyState.REJECTED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION) || phase.equals(R4EReviewPhase.REWORK)) {
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.DEFERRED);
+						states.add(R4EAnomalyState.REJECTED);
 					} else {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
+						states.add(R4EAnomalyState.REJECTED);
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
-					} else if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
+				case R4EAnomalyState.ACCEPTED_VALUE:
+					if (phase.equals(R4EReviewPhase.DECISION)) {
+						states.add(R4EAnomalyState.CREATED);
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.DUPLICATED);
+						states.add(R4EAnomalyState.DEFERRED);
+						states.add(R4EAnomalyState.REJECTED);
+					} else if (phase.equals(R4EReviewPhase.REWORK)) {
+						states.add(R4EAnomalyState.CREATED);
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.DUPLICATED);
+						states.add(R4EAnomalyState.DEFERRED);
+						states.add(R4EAnomalyState.REJECTED);
+						states.add(R4EAnomalyState.FIXED);
 					} else {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
+						states.add(R4EAnomalyState.ACCEPTED);
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_FIXED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED);
+				case R4EAnomalyState.FIXED_VALUE:
+					if (phase.equals(R4EReviewPhase.REWORK)) {
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.FIXED);
+						states.add(R4EAnomalyState.VERIFIED);
 					} else {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.FIXED);
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED);
+				case R4EAnomalyState.VERIFIED_VALUE:
+					states.add(R4EAnomalyState.FIXED);
+					states.add(R4EAnomalyState.VERIFIED);
 					break;
 
 				default:
@@ -761,51 +736,47 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 		final List<R4EAnomalyState> states = new ArrayList<R4EAnomalyState>();
 
 		if (null != R4EUIModelController.getActiveReview()) {
-			if (R4EUIModelController.getActiveReview()
-					.getReview()
-					.getType()
-					.equals(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL)) {
+			if (R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.INFORMAL)) {
 				switch (aCurrentState.getValue()) {
-				case R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
+				case R4EAnomalyState.ASSIGNED_VALUE:
+					states.add(R4EAnomalyState.FIXED);
+					states.add(R4EAnomalyState.DEFERRED);
+					states.add(R4EAnomalyState.DUPLICATED);
+					states.add(R4EAnomalyState.REJECTED);
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_FIXED_VALUE:
-					states.add(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED);
+				case R4EAnomalyState.FIXED_VALUE:
+					states.add(R4EAnomalyState.VERIFIED);
 					break;
 
 				default:
 					//should never happen
 				}
-			} else { //R4EReviewType.R4E_REVIEW_TYPE_FORMAL
+			} else { //R4EReviewType.FORMAL
 				final R4EReviewPhase phase = ((R4EFormalReview) R4EUIModelController.getActiveReview().getReview()).getCurrent()
 						.getType();
 				switch (aCurrentState.getValue()) {
-				case R4EAnomalyState.R4E_ANOMALY_STATE_CREATED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED)
-							|| phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
+				case R4EAnomalyState.CREATED_VALUE:
+					if (phase.equals(R4EReviewPhase.STARTED) || phase.equals(R4EReviewPhase.PREPARATION)) {
+						states.add(R4EAnomalyState.DUPLICATED);
+						states.add(R4EAnomalyState.REJECTED);
 					} else {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_DUPLICATED);
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED);
+						states.add(R4EAnomalyState.ACCEPTED);
+						states.add(R4EAnomalyState.DEFERRED);
+						states.add(R4EAnomalyState.DUPLICATED);
+						states.add(R4EAnomalyState.REJECTED);
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_FIXED);
+				case R4EAnomalyState.ACCEPTED_VALUE:
+					if (phase.equals(R4EReviewPhase.REWORK)) {
+						states.add(R4EAnomalyState.FIXED);
 					}
 					break;
 
-				case R4EAnomalyState.R4E_ANOMALY_STATE_FIXED_VALUE:
-					if (phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
-						states.add(R4EAnomalyState.R4E_ANOMALY_STATE_VERIFIED);
+				case R4EAnomalyState.FIXED_VALUE:
+					if (phase.equals(R4EReviewPhase.REWORK)) {
+						states.add(R4EAnomalyState.VERIFIED);
 					}
 					break;
 
@@ -824,9 +795,8 @@ public class R4EUIAnomalyExtended extends R4EUIAnomalyBasic {
 	 */
 	@Override
 	public boolean isTerminalState() {
-		if (fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_CREATED)
-				|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_ASSIGNED)
-				|| fAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_ACCEPTED)) {
+		if (fAnomaly.getState().equals(R4EAnomalyState.CREATED) || fAnomaly.getState().equals(R4EAnomalyState.ASSIGNED)
+				|| fAnomaly.getState().equals(R4EAnomalyState.ACCEPTED)) {
 			return false;
 		}
 		return true;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIComment.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIComment.java
index 5244402e..cce06c64 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIComment.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIComment.java
@@ -18,8 +18,8 @@
 
 package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IComment;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
@@ -137,7 +137,7 @@ public class R4EUIComment extends R4EUIModelElement {
 	 */
 	@Override
 	public String getToolTip() {
-		return fComment.getUser().getId() + ": " + fComment.getDescription();
+		return fComment.getAuthor().getId() + ": " + fComment.getDescription();
 	}
 
 	/**
@@ -205,11 +205,11 @@ public class R4EUIComment extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#setModelData(R4EReviewComponent)
 	 */
 	@Override
-	public void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
+	public void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
 		//Set data in model element
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fComment,
 				R4EUIModelController.getReviewer());
-		fComment.setDescription(((Comment) aModelComponent).getDescription());
+		fComment.setDescription(((IComment) aModelComponent).getDescription());
 		R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 	}
 
@@ -272,7 +272,7 @@ public class R4EUIComment extends R4EUIModelElement {
 	public boolean isCopyElementCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -310,7 +310,7 @@ public class R4EUIComment extends R4EUIModelElement {
 	public boolean isRemoveElementCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -352,7 +352,7 @@ public class R4EUIComment extends R4EUIModelElement {
 		if (isEnabled()
 				|| isReadOnly()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+						R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 		return true;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIContent.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIContent.java
index c100e037..0d58d5cf 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIContent.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIContent.java
@@ -21,7 +21,6 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -278,7 +277,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 
 		//Add this content to the reviewed contents for this user
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(user, user.getId());
-		user.getReviewedContent().add(fContent.getId());
+		user.getReviewedContent().add(fContent.getR4eId());
 		R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 	}
 
@@ -296,7 +295,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 		if (null != user) {
 			//Remove this content from the reviewed contents for this user
 			final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(user, user.getId());
-			user.getReviewedContent().remove(fContent.getId());
+			user.getReviewedContent().remove(fContent.getR4eId());
 			R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 		}
 	}
@@ -343,7 +342,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 			//Set new participants assigned
 			final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fContent,
 					R4EUIModelController.getReviewer());
-			final EList<String> assignedParticipants = fContent.getAssignedTo();
+			final List<String> assignedParticipants = fContent.getAssignedTo();
 			for (R4EParticipant participant : aParticipants) {
 				assignedParticipants.add(participant.getId());
 				((R4EUIReviewBasic) getParent().getParent().getParent().getParent()).getParticipant(
@@ -371,7 +370,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 			//Set new partcipants assigned
 			final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fContent,
 					R4EUIModelController.getReviewer());
-			final EList<String> assignedParticipants = fContent.getAssignedTo();
+			final List<String> assignedParticipants = fContent.getAssignedTo();
 			for (R4EParticipant participant : aParticipants) {
 				assignedParticipants.remove(participant.getId());
 			}
@@ -439,7 +438,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -471,7 +470,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			//We can only paste if there is a least 1 Anomaly in the clipboard
 			Object element = null;
 			ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
@@ -520,7 +519,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -537,7 +536,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -554,7 +553,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))
 				&& fContent.getAssignedTo().size() > 0) {
 			return true;
 		}
@@ -572,7 +571,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 		if (isEnabled()
 				&& !isReadOnly()
 				&& null != R4EUIModelController.getActiveReview()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -614,7 +613,7 @@ public abstract class R4EUIContent extends R4EUIModelElement {
 		if (isEnabled()
 				|| isReadOnly()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+						R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 		return true;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIContentsContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIContentsContainer.java
index c013cd15..ea03b908 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIContentsContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIContentsContainer.java
@@ -243,7 +243,7 @@ public abstract class R4EUIContentsContainer extends R4EUIModelElement {
 			if (null != user) {
 				//Check if the file contexts are part of the reviewed content
 				for (R4EUIContent uiContent : fContents) {
-					if (user.getReviewedContent().contains(uiContent.getContent().getId())) {
+					if (user.getReviewedContent().contains(uiContent.getContent().getR4eId())) {
 						uiContent.setUserReviewed(true, true, false);
 					}
 				}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIDeltaContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIDeltaContainer.java
index 7cc4f34f..207be755 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIDeltaContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIDeltaContainer.java
@@ -18,7 +18,8 @@
 
 package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
+
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EDelta;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ETextPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
@@ -102,7 +103,7 @@ public class R4EUIDeltaContainer extends R4EUIContentsContainer {
 	 */
 	@Override
 	public void open() {
-		final EList<R4EDelta> deltas = ((R4EUIFileContext) getParent()).getFileContext().getDeltas();
+		final List<R4EDelta> deltas = ((R4EUIFileContext) getParent()).getFileContext().getDeltas();
 		if (null != deltas) {
 			R4EUITextPosition position = null;
 			R4EUIDelta newDelta = null;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIFileContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIFileContainer.java
index cd6298bc..74de3ad0 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIFileContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIFileContainer.java
@@ -21,7 +21,6 @@ import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileContext;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EItem;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
@@ -175,7 +174,7 @@ public abstract class R4EUIFileContainer extends R4EUIModelElement {
 	 */
 	@Override
 	public void open() {
-		final EList<R4EFileContext> files = fItem.getFileContextList();
+		final List<R4EFileContext> files = fItem.getFileContextList();
 		if (null != files) {
 			R4EUIFileContext uiFileContext = null;
 			final int filesSize = files.size();
@@ -237,7 +236,7 @@ public abstract class R4EUIFileContainer extends R4EUIModelElement {
 				//Check if the file contexts are part of the reviewed content
 				for (R4EUIFileContext uiFile : fFileContexts) {
 					uiFile.verifyUserReviewed();
-					if (user.getReviewedContent().contains(uiFile.getFileContext().getId())) {
+					if (user.getReviewedContent().contains(uiFile.getFileContext().getR4eId())) {
 						uiFile.setUserReviewed(true, true, false);
 					}
 				}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIFileContext.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIFileContext.java
index 86f14657..1593967f 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIFileContext.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIFileContext.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.frame.ui.annotation.IReviewAnnotationModel;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileContext;
@@ -403,7 +402,7 @@ public class R4EUIFileContext extends R4EUIModelElement {
 
 		//Add this content to the reviewed contents for this user
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(user, user.getId());
-		user.getReviewedContent().add(fFile.getId());
+		user.getReviewedContent().add(fFile.getR4eId());
 		R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 	}
 
@@ -421,7 +420,7 @@ public class R4EUIFileContext extends R4EUIModelElement {
 		if (null != user) {
 			//Remove this content from the reviewed contents for this user
 			final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(user, user.getId());
-			user.getReviewedContent().remove(fFile.getId());
+			user.getReviewedContent().remove(fFile.getR4eId());
 			R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 		}
 	}
@@ -467,7 +466,7 @@ public class R4EUIFileContext extends R4EUIModelElement {
 			//Set new participants assigned
 			final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fFile,
 					R4EUIModelController.getReviewer());
-			final EList<String> assignedParticipants = fFile.getAssignedTo();
+			final List<String> assignedParticipants = fFile.getAssignedTo();
 			for (R4EParticipant participant : aParticipants) {
 				assignedParticipants.add(participant.getId());
 				((R4EUIReviewBasic) getParent().getParent()).getParticipant(participant.getId(), true);
@@ -498,7 +497,7 @@ public class R4EUIFileContext extends R4EUIModelElement {
 			//Set new participants assigned
 			final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fFile,
 					R4EUIModelController.getReviewer());
-			final EList<String> assignedParticipants = fFile.getAssignedTo();
+			final List<String> assignedParticipants = fFile.getAssignedTo();
 			for (R4EParticipant participant : aParticipants) {
 				assignedParticipants.remove(participant.getId());
 			}
@@ -880,7 +879,7 @@ public class R4EUIFileContext extends R4EUIModelElement {
 	public boolean isChangeUserReviewStateCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -896,7 +895,7 @@ public class R4EUIFileContext extends R4EUIModelElement {
 	public boolean isAssignToCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -912,7 +911,7 @@ public class R4EUIFileContext extends R4EUIModelElement {
 	public boolean isUnassignToCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))
 				&& fFile.getAssignedTo().size() > 0) {
 			return true;
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIModelController.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIModelController.java
index 73b3c8d7..13786e59 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIModelController.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIModelController.java
@@ -32,12 +32,11 @@ import org.eclipse.core.commands.NotEnabledException;
 import org.eclipse.core.commands.NotHandledException;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
+import org.eclipse.mylyn.reviews.core.model.ILocation;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
 import org.eclipse.mylyn.reviews.ldap.LdapPlugin;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
@@ -458,16 +457,16 @@ public class R4EUIModelController {
 	 */
 	public static void mapAnomalies(R4EReview aReview) {
 		clearAnomalyMap(); //Start with a clean map 
-		final EList<Topic> anomalies = aReview.getTopics();
-		Topic anomaly = null;
-		EList<Location> locations = null;
+		final List<ITopic> anomalies = aReview.getTopics();
+		ITopic anomaly = null;
+		List<ILocation> locations = null;
 		String targetFileVersion = null;
 		final int anomaliesSize = anomalies.size();
 		for (int i = 0; i < anomaliesSize; i++) {
 			anomaly = anomalies.get(i);
 
-			locations = anomaly.getLocation();
-			for (Location location : locations) {
+			locations = anomaly.getLocations();
+			for (ILocation location : locations) {
 				targetFileVersion = ((R4EAnomalyTextPosition) ((R4EContent) location).getLocation()).getFile()
 						.getLocalVersionID();
 				if (FFileAnomalyMap.containsKey(targetFileVersion)) {
@@ -541,7 +540,7 @@ public class R4EUIModelController {
 
 		//Test to see if the change file is within the latest review item
 		for (int j = 0; j < reviewItemsize; j++) {
-			EList<R4EFileContext> listFile = listReviewItems.get(j).getItem().getFileContextList();
+			List<R4EFileContext> listFile = listReviewItems.get(j).getItem().getFileContextList();
 			int size = listFile.size();
 			//Test if the selected container is not before the current container
 			Date testDate = listFile.get(0) != null
@@ -688,4 +687,4 @@ public class R4EUIModelController {
 	public static void resetToDefaultSerialization() {
 		SerializeFactory.getResourceSerializationRegistry().clearSerializationInactive();
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIModelElement.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIModelElement.java
index dbad7540..277b3e17 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIModelElement.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIModelElement.java
@@ -24,7 +24,7 @@ import java.io.FileNotFoundException;
 import java.util.List;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
@@ -471,7 +471,7 @@ public abstract class R4EUIModelElement implements IR4EUIModelElement, // $codep
 	 * @throws ResourceHandlingException
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildModelDataElement()
 	 */
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//default implementation
 		return null;
 	}
@@ -485,7 +485,7 @@ public abstract class R4EUIModelElement implements IR4EUIModelElement, // $codep
 	 * @throws OutOfSyncException
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#setModelData(R4EReviewComponent)
 	 */
-	public void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException { // $codepro.audit.disable emptyMethod, unnecessaryExceptions
+	public void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException { // $codepro.audit.disable emptyMethod, unnecessaryExceptions
 		//default implementation
 	}
 
@@ -541,7 +541,7 @@ public abstract class R4EUIModelElement implements IR4EUIModelElement, // $codep
 	 * @throws CompatibilityException
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(R4EReviewComponent)
 	 */
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws OutOfSyncException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws OutOfSyncException,
 			CompatibilityException, ResourceHandlingException { // $codepro.audit.disable unnecessaryExceptions
 		return null;
 		// default implementation
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
index 8dc9c3d8..7047271a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
@@ -24,9 +24,8 @@ import java.util.List;
 
 import javax.naming.NamingException;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
@@ -197,31 +196,31 @@ public class R4EUIParticipant extends R4EUIModelElement {
 	 * @return String
 	 */
 	public String getRoleIconPath(R4EReviewType aType) {
-		if (aType.equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+		if (aType.equals(R4EReviewType.BASIC)) {
 			return PARTICIPANT_ICON_FILE;
 		} else {
-			final EList<R4EUserRole> roles = fParticipant.getRoles();
+			final List<R4EUserRole> roles = fParticipant.getRoles();
 			//First check for Lead
 			for (R4EUserRole role : roles) {
-				if (role.equals(R4EUserRole.R4E_ROLE_LEAD)) {
+				if (role.equals(R4EUserRole.LEAD)) {
 					return PARTICIPANT_LEAD_ICON_FILE;
 				}
 			}
 			//Next Organizer
 			for (R4EUserRole role : roles) {
-				if (role.equals(R4EUserRole.R4E_ROLE_ORGANIZER)) {
+				if (role.equals(R4EUserRole.ORGANIZER)) {
 					return PARTICIPANT_ORGANIZER_ICON_FILE;
 				}
 			}
 			//Next Author
 			for (R4EUserRole role : roles) {
-				if (role.equals(R4EUserRole.R4E_ROLE_AUTHOR)) {
+				if (role.equals(R4EUserRole.AUTHOR)) {
 					return PARTICIPANT_AUTHOR_ICON_FILE;
 				}
 			}
 			//Finally Reviewer
 			for (R4EUserRole role : roles) {
-				if (role.equals(R4EUserRole.R4E_ROLE_REVIEWER)) {
+				if (role.equals(R4EUserRole.REVIEWER)) {
 					return PARTICIPANT_REVIEWER_ICON_FILE;
 				}
 			}
@@ -234,19 +233,19 @@ public class R4EUIParticipant extends R4EUIModelElement {
 	 * Method getRoles.
 	 * 
 	 * @param aRoles
-	 *            EList<R4EUserRole>
+	 *            List<R4EUserRole>
 	 * @return String[]
 	 */
-	public String[] getRoles(EList<R4EUserRole> aRoles) {
+	public String[] getRoles(List<R4EUserRole> aRoles) {
 		final List<String> roles = new ArrayList<String>();
 		for (R4EUserRole role : aRoles) {
-			if (role.getValue() == R4EUserRole.R4E_ROLE_ORGANIZER_VALUE) {
+			if (role.getValue() == R4EUserRole.ORGANIZER_VALUE) {
 				roles.add(R4EUIConstants.USER_ROLE_ORGANIZER);
-			} else if (role.getValue() == R4EUserRole.R4E_ROLE_LEAD_VALUE) {
+			} else if (role.getValue() == R4EUserRole.LEAD_VALUE) {
 				roles.add(R4EUIConstants.USER_ROLE_LEAD);
-			} else if (role.getValue() == R4EUserRole.R4E_ROLE_AUTHOR_VALUE) {
+			} else if (role.getValue() == R4EUserRole.AUTHOR_VALUE) {
 				roles.add(R4EUIConstants.USER_ROLE_AUTHOR);
-			} else if (role.getValue() == R4EUserRole.R4E_ROLE_REVIEWER_VALUE) {
+			} else if (role.getValue() == R4EUserRole.REVIEWER_VALUE) {
 				roles.add(R4EUIConstants.USER_ROLE_REVIEWER);
 			}
 		}
@@ -262,14 +261,14 @@ public class R4EUIParticipant extends R4EUIModelElement {
 	 */
 	public static R4EUserRole mapStringToRole(String aRoleStr) {
 		if (aRoleStr.equals(R4EUIConstants.USER_ROLE_ORGANIZER)) {
-			return R4EUserRole.R4E_ROLE_ORGANIZER;
+			return R4EUserRole.ORGANIZER;
 		} else if (aRoleStr.equals(R4EUIConstants.USER_ROLE_LEAD)) {
-			return R4EUserRole.R4E_ROLE_LEAD;
+			return R4EUserRole.LEAD;
 		}
 		if (aRoleStr.equals(R4EUIConstants.USER_ROLE_AUTHOR)) {
-			return R4EUserRole.R4E_ROLE_AUTHOR;
+			return R4EUserRole.AUTHOR;
 		} else if (aRoleStr.equals(R4EUIConstants.USER_ROLE_REVIEWER)) {
-			return R4EUserRole.R4E_ROLE_REVIEWER;
+			return R4EUserRole.REVIEWER;
 		}
 		return null;
 	}
@@ -282,14 +281,14 @@ public class R4EUIParticipant extends R4EUIModelElement {
 	 * @return String
 	 */
 	public static String mapRoleToString(R4EUserRole aRole) {
-		if (aRole.equals(R4EUserRole.R4E_ROLE_ORGANIZER)) {
+		if (aRole.equals(R4EUserRole.ORGANIZER)) {
 			return R4EUIConstants.USER_ROLE_ORGANIZER;
-		} else if (aRole.equals(R4EUserRole.R4E_ROLE_LEAD)) {
+		} else if (aRole.equals(R4EUserRole.LEAD)) {
 			return R4EUIConstants.USER_ROLE_LEAD;
 		}
-		if (aRole.equals(R4EUserRole.R4E_ROLE_AUTHOR)) {
+		if (aRole.equals(R4EUserRole.AUTHOR)) {
 			return R4EUIConstants.USER_ROLE_AUTHOR;
-		} else if (aRole.equals(R4EUserRole.R4E_ROLE_REVIEWER)) {
+		} else if (aRole.equals(R4EUserRole.REVIEWER)) {
 			return R4EUIConstants.USER_ROLE_REVIEWER;
 		}
 		return null;
@@ -333,7 +332,7 @@ public class R4EUIParticipant extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#setModelData(R4EReviewComponent)
 	 */
 	@Override
-	public void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
+	public void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
 		//Set data in model element
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fParticipant,
 				R4EUIModelController.getReviewer());
@@ -407,20 +406,20 @@ public class R4EUIParticipant extends R4EUIModelElement {
 				&& !isAssigned(fParticipant.getId(), true)
 				&& !isAnomalyCreator()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 
 			IR4EUIModelElement parentReview = this.getParent().getParent();
 			if (parentReview instanceof R4EUIReviewBasic) {
 				//Don't allow to remove the element if this is the last review lead in the current Review
-				if (fParticipant.getRoles().contains(R4EUserRole.R4E_ROLE_LEAD)) {
-					if (reviewerRoleSize((R4EUIReviewBasic) parentReview, R4EUserRole.R4E_ROLE_LEAD) < 2) {
+				if (fParticipant.getRoles().contains(R4EUserRole.LEAD)) {
+					if (reviewerRoleSize((R4EUIReviewBasic) parentReview, R4EUserRole.LEAD) < 2) {
 						//This is the only review lead left, it shall not be disabled
 						return false;
 					}
 				}
 
-				if (fParticipant.getRoles().contains(R4EUserRole.R4E_ROLE_ORGANIZER)) {
-					if (reviewerRoleSize((R4EUIReviewBasic) parentReview, R4EUserRole.R4E_ROLE_ORGANIZER) < 2) {
+				if (fParticipant.getRoles().contains(R4EUserRole.ORGANIZER)) {
+					if (reviewerRoleSize((R4EUIReviewBasic) parentReview, R4EUserRole.ORGANIZER) < 2) {
 						//This is the only organiser left, it shall not be disabled
 						return false;
 					}
@@ -448,7 +447,7 @@ public class R4EUIParticipant extends R4EUIModelElement {
 		int roleCount = 0;
 		for (R4EParticipant participant : participants) {
 			//Don't consider disabled participants within the count
-			EList<R4EUserRole> roles = participant.getRoles();
+			List<R4EUserRole> roles = participant.getRoles();
 			for (R4EUserRole role : roles) {
 				if (role.equals(aRole)) {
 					roleCount++;
@@ -481,9 +480,9 @@ public class R4EUIParticipant extends R4EUIModelElement {
 	 * @return boolean
 	 */
 	private boolean isAnomalyCreator() {
-		final EList<Topic> anomalies = ((R4EUIReviewBasic) getParent().getParent()).getReview().getTopics();
-		for (Topic anomaly : anomalies) {
-			if (anomaly.isEnabled() && anomaly.getUser().equals(fParticipant)) {
+		final List<ITopic> anomalies = ((R4EUIReviewBasic) getParent().getParent()).getReview().getTopics();
+		for (ITopic anomaly : anomalies) {
+			if (anomaly.getAuthor().equals(fParticipant)) {
 				return true;
 			}
 		}
@@ -526,7 +525,7 @@ public class R4EUIParticipant extends R4EUIModelElement {
 		if (isEnabled()
 				|| isReadOnly()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+						R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 		return true;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
index 078d17c0..ba080728 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewState;
@@ -108,9 +108,9 @@ public class R4EUIParticipantContainer extends R4EUIModelElement {
 	 * @return the new serialization element object
 	 */
 	@Override
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//Get Participants from user and set them in model data
-		final List<ReviewComponent> tempParticipants = new ArrayList<ReviewComponent>();
+		final List<IReviewComponent> tempParticipants = new ArrayList<IReviewComponent>();
 		final IParticipantInputDialog dialog = R4EUIDialogFactory.getInstance().getParticipantInputDialog(true);
 		final int result = dialog.open();
 		if (result == Window.OK) {
@@ -259,7 +259,7 @@ public class R4EUIParticipantContainer extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(ReviewNavigatorContentProvider)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException {
 
 		R4EUIParticipant addedChild = null;
@@ -334,7 +334,7 @@ public class R4EUIParticipantContainer extends R4EUIModelElement {
 			final R4EReviewPhase phase = ((R4EReviewState) R4EUIModelController.getActiveReview()
 					.getReview()
 					.getState()).getState();
-			if (!phase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+			if (!phase.equals(R4EReviewPhase.COMPLETED)) {
 				return true;
 			}
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedAnomaly.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedAnomaly.java
index 39fba876..e40eb9cd 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedAnomaly.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedAnomaly.java
@@ -18,22 +18,25 @@
 
 package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 
+import java.util.Map;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EMap;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.reviews.frame.core.model.Comment;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IComment;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
+import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
 import org.eclipse.mylyn.reviews.r4e.ui.R4EUIPlugin;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.properties.general.PostponedAnomalyProperties;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.utils.CommandUtils;
@@ -166,7 +169,7 @@ public class R4EUIPostponedAnomaly extends R4EUIAnomalyExtended {
 	public void updateAnomaly(R4EAnomaly aPostponedAnomaly) throws ResourceHandlingException, OutOfSyncException {
 
 		//Disable the anomaly if it is not postponed anymore
-		if (aPostponedAnomaly.getState().equals(R4EAnomalyState.R4E_ANOMALY_STATE_DEFERRED)) {
+		if (aPostponedAnomaly.getState().equals(R4EAnomalyState.DEFERRED)) {
 			fAnomaly.setEnabled(aPostponedAnomaly.isEnabled());
 			//Close Anomaly if disabled
 			if (!fAnomaly.isEnabled()) {
@@ -222,21 +225,21 @@ public class R4EUIPostponedAnomaly extends R4EUIAnomalyExtended {
 		final R4EUIReviewGroup uiGroup = (R4EUIReviewGroup) getParent().getParent().getParent().getParent();
 		R4EReview originalReview = R4EUIModelController.FModelExt.openR4EReview(uiGroup.getReviewGroup(),
 				origReviewName);
-		int checkResult = originalReview.getCompatibility();
+		String currentVersion = Persistence.Roots.REVIEW.getVersion();
+		int checkResult = VersionUtils.compareVersions(currentVersion, originalReview.getFragmentVersion());
 		switch (checkResult) {
 		case R4EUIConstants.VERSION_APPLICATION_OLDER:
 			displayCompatibilityErrorDialog();
 			return false;
 		case R4EUIConstants.VERSION_APPLICATION_NEWER:
-			int result = displayCompatibilityWarningDialog(originalReview.getFragmentVersion(),
-					originalReview.getApplicationVersion());
+			int result = displayCompatibilityWarningDialog(originalReview.getFragmentVersion(), currentVersion);
 			switch (result) {
 			case R4EUIConstants.OPEN_NORMAL:
 				//Upgrade version immediately
 				try {
 					Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(originalReview,
 							R4EUIModelController.getReviewer());
-					originalReview.setFragmentVersion(originalReview.getApplicationVersion());
+					originalReview.setFragmentVersion(currentVersion);
 					R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 				} catch (ResourceHandlingException e) {
 					UIUtils.displayResourceErrorDialog(e);
@@ -273,10 +276,10 @@ public class R4EUIPostponedAnomaly extends R4EUIAnomalyExtended {
 		//Check if the creator of the postponed anomaly is a participant of the current review.  If not, it will be 
 		//created and disabled after the postponed anomaly is created
 		final R4EUIReviewBasic uiReview = R4EUIModelController.getActiveReview();
-		R4EParticipant participant = uiReview.getParticipant(aPostponedComment.getUser().getId(), false);
+		R4EParticipant participant = uiReview.getParticipant(aPostponedComment.getAuthor().getId(), false);
 		boolean isParticipant = true;
 		if (null == participant) {
-			participant = uiReview.getParticipant(aPostponedComment.getUser().getId(), true);
+			participant = uiReview.getParticipant(aPostponedComment.getAuthor().getId(), true);
 			isParticipant = false;
 		}
 
@@ -286,7 +289,7 @@ public class R4EUIPostponedAnomaly extends R4EUIAnomalyExtended {
 		Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(comment, R4EUIModelController.getReviewer());
 		comment.setDescription(aPostponedComment.getDescription());
 		comment.setCreatedOn(aPostponedComment.getCreatedOn());
-		final EMap<String, String> info = comment.getInfoAtt(); //We use the R4EComment attribute map to store the original comment ID
+		final Map<String, String> info = comment.getInfoAtt(); //We use the R4EComment attribute map to store the original comment ID
 		info.put(R4EUIConstants.POSTPONED_ATTR_ORIG_COMMENT_ID, CommandUtils.buildOriginalCommentID(aPostponedComment));
 		R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 
@@ -315,7 +318,7 @@ public class R4EUIPostponedAnomaly extends R4EUIAnomalyExtended {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(R4EReviewComponent)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException, CompatibilityException {
 
 		//First create the children on the original anomaly...
@@ -334,7 +337,7 @@ public class R4EUIPostponedAnomaly extends R4EUIAnomalyExtended {
 			origComment = R4EUIModelController.FModelExt.createR4EComment(participantInOrigReview, origAnomaly);
 			final Long origBookNum = R4EUIModelController.FResourceUpdater.checkOut(origComment,
 					participantInOrigReview.getId());
-			origComment.setDescription(((Comment) aModelComponent).getDescription());
+			origComment.setDescription(((IComment) aModelComponent).getDescription());
 			R4EUIModelController.FResourceUpdater.checkIn(origBookNum);
 		}
 		//Close original review
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedAnomalyContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedAnomalyContainer.java
index 6f7f2284..fd5a6772 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedAnomalyContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedAnomalyContainer.java
@@ -20,10 +20,9 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
@@ -126,7 +125,7 @@ public class R4EUIPostponedAnomalyContainer extends R4EUIAnomalyContainer {
 		R4EUIPostponedAnomaly uiAnomaly = null;
 		final IR4EUIModelElement parentElement = getParent();
 		//Get global postponed anomalies
-		final EList<Topic> anomalies = ((R4EUIReviewBasic) parentElement.getParent()).getReview().getTopics();
+		final List<ITopic> anomalies = ((R4EUIReviewBasic) parentElement.getParent()).getReview().getTopics();
 		if (null != anomalies) {
 			final int anomaliesSize = anomalies.size();
 			R4EAnomaly anomaly = null;
@@ -137,7 +136,7 @@ public class R4EUIPostponedAnomalyContainer extends R4EUIAnomalyContainer {
 							|| R4EUIPlugin.getDefault()
 									.getPreferenceStore()
 									.getBoolean(PreferenceConstants.P_SHOW_DISABLED)) {
-						if (0 == anomaly.getLocation().size()) {
+						if (0 == anomaly.getLocations().size()) {
 							uiAnomaly = new R4EUIPostponedAnomaly(this, anomaly, null);
 							uiAnomaly.setName(R4EUIAnomalyExtended.getStateString(anomaly.getState()) + ": "
 									+ uiAnomaly.getName());
@@ -201,17 +200,17 @@ public class R4EUIPostponedAnomalyContainer extends R4EUIAnomalyContainer {
 		//Check if the creator of the postponed anomaly is a participant of the current review.  If not, it will be 
 		//created and disabled after the postponed anomaly is created
 		final R4EUIReviewBasic uiReview = R4EUIModelController.getActiveReview();
-		R4EParticipant participant = uiReview.getParticipant(aPostponedAnomaly.getUser().getId(), false);
+		R4EParticipant participant = uiReview.getParticipant(aPostponedAnomaly.getAuthor().getId(), false);
 		boolean isParticipant = true;
 		if (null == participant) {
-			participant = uiReview.getParticipant(aPostponedAnomaly.getUser().getId(), true);
+			participant = uiReview.getParticipant(aPostponedAnomaly.getAuthor().getId(), true);
 			isParticipant = false;
 		}
 
 		//Copy anomaly information from postponed anomaly model element if Anomaly does not already exist.  Otherwise it means it is disabled so restore it
-		List<Topic> savedGlobalAnomalies = ((R4EUIReviewBasic) getParent().getParent()).getReview().getTopics();
+		List<ITopic> savedGlobalAnomalies = ((R4EUIReviewBasic) getParent().getParent()).getReview().getTopics();
 		R4EAnomaly anomaly = null;
-		for (Topic savedAnomaly : savedGlobalAnomalies) {
+		for (ITopic savedAnomaly : savedGlobalAnomalies) {
 			if (null == ((R4EAnomaly) savedAnomaly).getInfoAtt().get(R4EUIConstants.POSTPONED_ATTR_ORIG_ANOMALY_ID)) {
 				//This is a genuine anomaly, not a postponed one, so we ignore it
 				continue;
@@ -233,7 +232,7 @@ public class R4EUIPostponedAnomalyContainer extends R4EUIAnomalyContainer {
 			anomaly = R4EUIModelController.FModelExt.createR4EAnomaly(participant);
 			CommandUtils.copyAnomalyData(anomaly, aPostponedAnomaly);
 			Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(anomaly, R4EUIModelController.getReviewer());
-			final EMap<String, String> info = anomaly.getInfoAtt(); //We use the R4EAnomaly attribute map to store the original anomaly ID
+			final Map<String, String> info = anomaly.getInfoAtt(); //We use the R4EAnomaly attribute map to store the original anomaly ID
 			info.put(R4EUIConstants.POSTPONED_ATTR_ORIG_ANOMALY_ID,
 					CommandUtils.buildOriginalAnomalyID(aPostponedAnomaly));
 			info.put(R4EUIConstants.POSTPONED_ATTR_ORIG_REVIEW_NAME, aUiReview.getReview().getName());
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedContainer.java
index 6d915c2f..8c32e2e0 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedContainer.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileContext;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileVersion;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EItem;
@@ -164,7 +163,7 @@ public class R4EUIPostponedContainer extends R4EUIFileContainer {
 	 */
 	@Override
 	public void open() {
-		final EList<R4EFileContext> files = fItem.getFileContextList();
+		final List<R4EFileContext> files = fItem.getFileContextList();
 		if (null != files) {
 			R4EUIPostponedFile uiFile = null;
 			final int filesSize = files.size();
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedFile.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedFile.java
index 23b8abce..7b03543a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedFile.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIPostponedFile.java
@@ -21,11 +21,10 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
+import org.eclipse.mylyn.reviews.core.model.ILocation;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
@@ -230,14 +229,14 @@ public class R4EUIPostponedFile extends R4EUIFileContext {
 			}
 			if (anomaly.isEnabled()
 					|| R4EUIPlugin.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.P_SHOW_DISABLED)) {
-				//Do not set position for global EList<E>lies
+				//Do not set position for global List<E>lies
 				position = null;
-				EList<Location> locations = anomaly.getLocation(); // $codepro.audit.disable variableDeclaredInLoop
+				List<ILocation> locations = anomaly.getLocations(); // $codepro.audit.disable variableDeclaredInLoop
 				if (null != locations) {
 					if (null != locations.get(0)) {
 						int locationsSize = locations.size(); // $codepro.audit.disable variableDeclaredInLoop
 						for (int j = 0; j < locationsSize; j++) {
-							position = new R4EUITextPosition(((R4EContent) anomaly.getLocation().get(j)).getLocation());
+							position = new R4EUITextPosition(((R4EContent) anomaly.getLocations().get(j)).getLocation());
 							uiAnomaly = new R4EUIPostponedAnomaly(this, anomaly, position);
 							uiAnomaly.setName(R4EUIAnomalyExtended.getStateString(anomaly.getState()) + ": "
 									+ uiAnomaly.getName());
@@ -295,10 +294,10 @@ public class R4EUIPostponedFile extends R4EUIFileContext {
 		//Check if the creator of the postponed anomaly is a participant of the current review.  If not, it will be 
 		//created and disabled after the postponed anomaly is created
 		final R4EUIReviewBasic uiReview = R4EUIModelController.getActiveReview();
-		R4EParticipant participant = uiReview.getParticipant(aPostponedAnomaly.getUser().getId(), false);
+		R4EParticipant participant = uiReview.getParticipant(aPostponedAnomaly.getAuthor().getId(), false);
 		boolean isParticipant = true;
 		if (null == participant) {
-			participant = uiReview.getParticipant(aPostponedAnomaly.getUser().getId(), true);
+			participant = uiReview.getParticipant(aPostponedAnomaly.getAuthor().getId(), true);
 			isParticipant = false;
 		}
 
@@ -328,7 +327,7 @@ public class R4EUIPostponedFile extends R4EUIFileContext {
 			//Brand new imported anomaly, set data
 			anomaly = R4EUIModelController.FModelExt.createR4EAnomaly(participant);
 			CommandUtils.copyAnomalyData(anomaly, aPostponedAnomaly);
-			final EMap<String, String> info = anomaly.getInfoAtt(); //We use the R4EAnomaly attribute map to store the original anomaly ID
+			final Map<String, String> info = anomaly.getInfoAtt(); //We use the R4EAnomaly attribute map to store the original anomaly ID
 			info.put(R4EUIConstants.POSTPONED_ATTR_ORIG_ANOMALY_ID,
 					CommandUtils.buildOriginalAnomalyID(aPostponedAnomaly));
 			info.put(R4EUIConstants.POSTPONED_ATTR_ORIG_REVIEW_NAME, aOrigReviewName);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
index e6a25cff..a65d7dc7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
@@ -24,15 +24,14 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.mylyn.reviews.frame.core.model.Item;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
-import org.eclipse.mylyn.reviews.frame.core.model.Topic;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewItem;
+import org.eclipse.mylyn.reviews.core.model.ITopic;
 import org.eclipse.mylyn.reviews.notifications.core.IMeetingData;
 import org.eclipse.mylyn.reviews.notifications.spi.NotificationsConnector;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
@@ -50,11 +49,13 @@ import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUserReviews;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EUserRole;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.RModelFactoryExt;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ResourceUpdater;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
+import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
 import org.eclipse.mylyn.reviews.r4e.ui.R4EUIPlugin;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.commands.handlers.ImportPostponedHandler;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs.R4EUIDialogFactory;
@@ -273,12 +274,12 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 */
 	public String getImageLocation() {
 		if (isOpen()) {
-			if (fReview.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+			if (fReview.getType().equals(R4EReviewType.BASIC)) {
 				return REVIEW_BASIC_ICON_FILE;
 			}
 			return REVIEW_INFORMAL_ICON_FILE;
 		}
-		if (fReview.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+		if (fReview.getType().equals(R4EReviewType.BASIC)) {
 			return REVIEW_BASIC_CLOSED_ICON_FILE;
 		}
 		return REVIEW_INFORMAL_CLOSED_ICON_FILE;
@@ -344,9 +345,9 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 * @return String
 	 */
 	private static String getReviewDisplayName(String aName, R4EReviewType aType) {
-		if (aType.equals(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL)) {
+		if (aType.equals(R4EReviewType.INFORMAL)) {
 			return R4EUIConstants.REVIEW_TYPE_INFORMAL + ": " + aName;
-		} else if (aType.equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+		} else if (aType.equals(R4EReviewType.BASIC)) {
 			return R4EUIConstants.REVIEW_TYPE_BASIC + ": " + aName;
 		} else {
 			//No change.  For formal review the name is set in the subclass
@@ -364,7 +365,7 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#setModelData(R4EReviewComponent)
 	 */
 	@Override
-	public void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
+	public void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
 		//Set data in model element
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fReview, R4EUIModelController.getReviewer());
 		fReview.setExtraNotes(((R4EReview) aModelComponent).getExtraNotes());
@@ -449,7 +450,7 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 		} else {
 			if (aCreate) {
 				final List<R4EUserRole> role = new ArrayList<R4EUserRole>(1);
-				role.add(R4EUserRole.R4E_ROLE_REVIEWER);
+				role.add(R4EUserRole.REVIEWER);
 				participant = R4EUIModelController.FModelExt.createR4EParticipant(fReview, aParticipant, role);
 				fParticipantsContainer.addChildren(new R4EUIParticipant(fParticipantsContainer, participant,
 						fReview.getType()));
@@ -485,7 +486,9 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 
 	/**
 	 * Method getParticipants.
-	 * @param aIncludeDisabled - boolean
+	 * 
+	 * @param aIncludeDisabled
+	 *            - boolean
 	 * @return List<R4EParticipant>
 	 */
 	public List<R4EParticipant> getParticipants(boolean aIncludeDisabled) {
@@ -681,7 +684,7 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 		fReadOnly = false;
 		R4EUIModelController.FModelExt.closeR4EReview(fReview); //Notify model
 		R4EUIModelController.clearAnomalyMap();
-		if (fReview.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+		if (fReview.getType().equals(R4EReviewType.BASIC)) {
 			fImage = UIUtils.loadIcon(REVIEW_BASIC_CLOSED_ICON_FILE);
 		} else {
 			fImage = UIUtils.loadIcon(REVIEW_INFORMAL_CLOSED_ICON_FILE);
@@ -699,10 +702,12 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 */
 	@Override
 	public void open() throws ResourceHandlingException, FileNotFoundException, CompatibilityException {
+		fReview = null;
+//		try {
 		fReview = R4EUIModelController.FModelExt.openR4EReview(((R4EUIReviewGroup) getParent()).getReviewGroup(),
 				fReviewName);
 		if (checkCompatibility()) {
-			final EList<Item> items = fReview.getReviewItems();
+			final List<IReviewItem> items = fReview.getItems();
 			if (null != items) {
 
 				IR4EUIModelElement uiItem = null;
@@ -723,7 +728,7 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 									R4EUIConstants.IMPORTED_ANOMALIES_LABEL_NAME);
 						} else if (null == item.getRepositoryRef() || "".equals(item.getRepositoryRef())) {
 							//Resource
-							EList<R4EFileContext> contextList = item.getFileContextList();
+							List<R4EFileContext> contextList = item.getFileContextList();
 							StringBuilder name = new StringBuilder("Resource: "); //$NON-NLS-1$
 							if (contextList.size() > 0) {
 								name = name.append(item.getFileContextList().get(0).getTarget().getName());
@@ -767,9 +772,9 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 			}
 
 			fOpen = true;
-			if (fReview.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+			if (fReview.getType().equals(R4EReviewType.BASIC)) {
 				fImage = UIUtils.loadIcon(REVIEW_BASIC_ICON_FILE);
-			} else if (fReview.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL)) {
+			} else if (fReview.getType().equals(R4EReviewType.INFORMAL)) {
 				fImage = UIUtils.loadIcon(REVIEW_INFORMAL_ICON_FILE);
 			}
 
@@ -808,21 +813,21 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 * @return boolean
 	 */
 	private boolean checkCompatibility() {
-		final int checkResult = fReview.getCompatibility();
+		String currentVersion = Persistence.Roots.REVIEW.getVersion();
+		int checkResult = VersionUtils.compareVersions(currentVersion, fReview.getFragmentVersion());
 		switch (checkResult) {
 		case R4EUIConstants.VERSION_APPLICATION_OLDER:
 			UIUtils.displayCompatibilityErrorDialog();
 			return false;
 		case R4EUIConstants.VERSION_APPLICATION_NEWER:
-			final int result = UIUtils.displayCompatibilityWarningDialog(fReview.getFragmentVersion(),
-					fReview.getApplicationVersion());
+			final int result = UIUtils.displayCompatibilityWarningDialog(fReview.getFragmentVersion(), currentVersion);
 			switch (result) {
 			case R4EUIConstants.OPEN_NORMAL:
 				//Upgrade version immediately
 				try {
 					final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fReview,
 							R4EUIModelController.getReviewer());
-					fReview.setFragmentVersion(fReview.getApplicationVersion());
+					fReview.setFragmentVersion(currentVersion);
 					R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 				} catch (ResourceHandlingException e) {
 					UIUtils.displayResourceErrorDialog(e);
@@ -890,12 +895,11 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	public boolean isDueDatePassed() {
 		if (isEnabled()) {
 			if (null != fReview.getDueDate()
-					&& !((R4EReviewState) fReview.getState()).getState().equals(
-							R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+					&& !((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.COMPLETED)) {
 				Calendar cal = Calendar.getInstance();
 				cal.setTime(new Date());
 				cal.add(Calendar.DAY_OF_YEAR, -1);
-				if (fReview.getDueDate().before(cal.getTime())) {
+				if (fReview.getDueDate() != null && fReview.getDueDate().before(cal.getTime())) {
 					return true;
 				}
 			}
@@ -1146,7 +1150,7 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(reviewItem,
 				R4EUIModelController.getReviewer());
-		final EMap<String, String> info = reviewItem.getInfoAtt(); //We use the R4EItem attribute map to mark this as postponed
+		final Map<String, String> info = reviewItem.getInfoAtt(); //We use the R4EItem attribute map to mark this as postponed
 		info.put(R4EUIConstants.POSTPONED_ATTR_STR, R4EUIConstants.TRUE_ATTR_VALUE_STR);
 		R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 
@@ -1295,10 +1299,8 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 */
 	@Override
 	public boolean isChangeUserReviewStateCmd() {
-		if (isEnabled()
-				&& isOpen()
-				&& !isReadOnly()
-				&& !(((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+		if (isEnabled() && isOpen() && !isReadOnly()
+				&& !(((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -1520,8 +1522,8 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 			}
 
 			//Anomalies
-			final EList<Topic> anomalies = fReview.getTopics();
-			for (Topic anomaly : anomalies) {
+			final List<ITopic> anomalies = fReview.getTopics();
+			for (ITopic anomaly : anomalies) {
 				if (anomaly.isEnabled() && ((R4EAnomaly) anomaly).getAssignedTo().contains(aUsername)) {
 					return true;
 				}
@@ -1591,10 +1593,8 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 */
 	@Override
 	public boolean isImportPostponedCmd() {
-		if ((!getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC))
-				&& isOpen()
-				&& !isReadOnly()
-				&& !(((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+		if ((!getReview().getType().equals(R4EReviewType.BASIC)) && isOpen() && !isReadOnly()
+				&& !(((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -1613,13 +1613,13 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	public void setDate(R4EReviewPhase aNewPhase) throws ResourceHandlingException, OutOfSyncException {
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fReview, R4EUIModelController.getReviewer());
 		final Date date = Calendar.getInstance().getTime();
-		if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
+		if (aNewPhase.equals(R4EReviewPhase.PREPARATION)) {
 			((R4EFormalReview) fReview).getCurrent().setStartDate(date);
-		} else if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)) {
+		} else if (aNewPhase.equals(R4EReviewPhase.DECISION)) {
 			((R4EFormalReview) fReview).getCurrent().setStartDate(date);
-		} else if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
+		} else if (aNewPhase.equals(R4EReviewPhase.REWORK)) {
 			((R4EFormalReview) fReview).getCurrent().setStartDate(date);
-		} else if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		} else if (aNewPhase.equals(R4EReviewPhase.COMPLETED)) {
 			fReview.setEndDate(date);
 		} else {
 			fReview.setEndDate(null);
@@ -1642,7 +1642,7 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 					R4EUIModelController.getReviewer());
 			((R4EReviewState) fReview.getState()).setState(aNewPhase);
 			//Set end date when the review is completed
-			if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+			if (aNewPhase.equals(R4EReviewPhase.COMPLETED)) {
 				R4EUIModelController.getActiveReview().getReview().setEndDate(Calendar.getInstance().getTime());
 			} else {
 				R4EUIModelController.getActiveReview().getReview().setEndDate(null);
@@ -1659,9 +1659,9 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 * @return String
 	 */
 	public String getPhaseString(R4EReviewPhase aNewPhase) {
-		if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED)) {
+		if (aNewPhase.equals(R4EReviewPhase.STARTED)) {
 			return R4EUIConstants.REVIEW_PHASE_STARTED;
-		} else if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		} else if (aNewPhase.equals(R4EReviewPhase.COMPLETED)) {
 			return R4EUIConstants.REVIEW_PHASE_COMPLETED;
 		} else {
 			return "";
@@ -1677,9 +1677,9 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 */
 	public R4EReviewPhase getPhaseFromString(String aNewPhase) {
 		if (aNewPhase.equals(R4EUIConstants.REVIEW_PHASE_STARTED)) {
-			return R4EReviewPhase.R4E_REVIEW_PHASE_STARTED;
+			return R4EReviewPhase.STARTED;
 		} else if (aNewPhase.equals(R4EUIConstants.REVIEW_PHASE_COMPLETED)) {
-			return R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED;
+			return R4EReviewPhase.COMPLETED;
 		} else {
 			return null; //should never happen
 		}
@@ -1738,14 +1738,14 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 		final List<R4EReviewPhase> phases = new ArrayList<R4EReviewPhase>();
 
 		switch (aCurrentPhase.getValue()) {
-		case R4EReviewPhase.R4E_REVIEW_PHASE_STARTED_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+		case R4EReviewPhase.STARTED_VALUE:
+			phases.add(R4EReviewPhase.STARTED);
+			phases.add(R4EReviewPhase.COMPLETED);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED);
+		case R4EReviewPhase.COMPLETED_VALUE:
+			phases.add(R4EReviewPhase.COMPLETED);
+			phases.add(R4EReviewPhase.STARTED);
 			break;
 
 		default:
@@ -1767,7 +1767,7 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	public boolean validatePhaseChange(R4EReviewPhase aNextPhase, AtomicReference<String> aErrorMessage) { // $codepro.audit.disable booleanMethodNamingConvention
 
 		switch (aNextPhase.getValue()) {
-		case R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED_VALUE:
+		case R4EReviewPhase.COMPLETED_VALUE:
 			if (!checkCompletionStatus(aErrorMessage)) {
 				return false;
 			}
@@ -1787,18 +1787,18 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 * @return boolean
 	 */
 	public boolean checkCompletionStatus(AtomicReference<String> aErrorMessage) { // $codepro.audit.disable booleanMethodNamingConvention
-		if (!(fReview.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC))) {
+		if (!(fReview.getType().equals(R4EReviewType.BASIC))) {
 			if (null == fReview.getDecision() || null == fReview.getDecision().getValue()) {
 				aErrorMessage.set("Phase cannot be changed to " + R4EUIConstants.REVIEW_PHASE_COMPLETED
 						+ " as review exit decision information is missing");
 				return false;
 			}
-			if (fReview.getDecision().getValue().equals(R4EDecision.R4E_REVIEW_DECISION_NONE)) {
+			if (fReview.getDecision().getValue().equals(R4EDecision.NONE)) {
 				aErrorMessage.set("Phase cannot be changed to " + R4EUIConstants.REVIEW_PHASE_COMPLETED
 						+ " as review exit decision information is set to NONE");
 				return false;
 			}
-			if (fReview.getDecision().getValue().equals(R4EDecision.R4E_REVIEW_DECISION_REJECTED)) {
+			if (fReview.getDecision().getValue().equals(R4EDecision.REJECTED)) {
 				aErrorMessage.set("Phase cannot be changed to " + R4EUIConstants.REVIEW_PHASE_COMPLETED
 						+ " as review exit decision information is set to REJECTED");
 				return true;
@@ -1845,7 +1845,7 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	 * @return boolean
 	 */
 	public boolean isExitDecisionEnabled() {
-		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 		return true;
@@ -1870,13 +1870,13 @@ public class R4EUIReviewBasic extends R4EUIModelElement {
 	public static R4EReviewDecision getDecisionValueFromString(String aDecision) {
 		final R4EReviewDecision reviewDecision = RModelFactoryExt.eINSTANCE.createR4EReviewDecision();
 		if (aDecision.equals(EXIT_DECISION_ACCEPTED)) {
-			reviewDecision.setValue(R4EDecision.R4E_REVIEW_DECISION_ACCEPTED);
+			reviewDecision.setValue(R4EDecision.ACCEPTED);
 		} else if (aDecision.equals(EXIT_DECISION_ACCEPTED_FOLLOWUP)) {
-			reviewDecision.setValue(R4EDecision.R4E_REVIEW_DECISION_ACCEPTED_FOLLOWUP);
+			reviewDecision.setValue(R4EDecision.ACCEPTED_FOLLOWUP);
 		} else if (aDecision.equals(EXIT_DECISION_REJECTED)) {
-			reviewDecision.setValue(R4EDecision.R4E_REVIEW_DECISION_REJECTED);
+			reviewDecision.setValue(R4EDecision.REJECTED);
 		} else {
-			reviewDecision.setValue(R4EDecision.R4E_REVIEW_DECISION_NONE);
+			reviewDecision.setValue(R4EDecision.NONE);
 		}
 		return reviewDecision;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewExtended.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewExtended.java
index 072d21ea..427f6793 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewExtended.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewExtended.java
@@ -25,7 +25,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EDecision;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFormalReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
@@ -208,7 +207,7 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 
 		//Check if the phase already exists
 		R4EReviewPhaseInfo newPhase = null;
-		final EList<R4EReviewPhaseInfo> phases = formalReview.getPhases();
+		final List<R4EReviewPhaseInfo> phases = formalReview.getPhases();
 		for (R4EReviewPhaseInfo phase : phases) {
 			if (phase.getType().equals(aNewPhase)) {
 				newPhase = phase;
@@ -248,15 +247,15 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 	 */
 	@Override
 	public String getPhaseString(R4EReviewPhase aNewPhase) {
-		if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED)) {
+		if (aNewPhase.equals(R4EReviewPhase.STARTED)) {
 			return R4EUIConstants.PHASE_PLANNING_LABEL;
-		} else if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
+		} else if (aNewPhase.equals(R4EReviewPhase.PREPARATION)) {
 			return R4EUIConstants.PHASE_PREPARATION_LABEL;
-		} else if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)) {
+		} else if (aNewPhase.equals(R4EReviewPhase.DECISION)) {
 			return R4EUIConstants.PHASE_DECISION_LABEL;
-		} else if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
+		} else if (aNewPhase.equals(R4EReviewPhase.REWORK)) {
 			return R4EUIConstants.PHASE_REWORK_LABEL;
-		} else if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		} else if (aNewPhase.equals(R4EReviewPhase.COMPLETED)) {
 			return R4EUIConstants.REVIEW_PHASE_COMPLETED;
 		} else {
 			return "";
@@ -273,15 +272,15 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 	@Override
 	public R4EReviewPhase getPhaseFromString(String aNewPhase) {
 		if (aNewPhase.equals(R4EUIConstants.PHASE_PLANNING_LABEL)) {
-			return R4EReviewPhase.R4E_REVIEW_PHASE_STARTED;
+			return R4EReviewPhase.STARTED;
 		} else if (aNewPhase.equals(R4EUIConstants.PHASE_PREPARATION_LABEL)) {
-			return R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION;
+			return R4EReviewPhase.PREPARATION;
 		} else if (aNewPhase.equals(R4EUIConstants.PHASE_DECISION_LABEL)) {
-			return R4EReviewPhase.R4E_REVIEW_PHASE_DECISION;
+			return R4EReviewPhase.DECISION;
 		} else if (aNewPhase.equals(R4EUIConstants.PHASE_REWORK_LABEL)) {
-			return R4EReviewPhase.R4E_REVIEW_PHASE_REWORK;
+			return R4EReviewPhase.REWORK;
 		} else if (aNewPhase.equals(R4EUIConstants.REVIEW_PHASE_COMPLETED)) {
-			return R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED;
+			return R4EReviewPhase.COMPLETED;
 		} else {
 			return null; //should never happen
 		}
@@ -337,14 +336,14 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 
 		switch (currentPhase.getValue()) {
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_DECISION_VALUE:
-			return R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION;
+		case R4EReviewPhase.DECISION_VALUE:
+			return R4EReviewPhase.PREPARATION;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_REWORK_VALUE:
-			return R4EReviewPhase.R4E_REVIEW_PHASE_DECISION;
+		case R4EReviewPhase.REWORK_VALUE:
+			return R4EReviewPhase.DECISION;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED_VALUE:
-			return R4EReviewPhase.R4E_REVIEW_PHASE_REWORK;
+		case R4EReviewPhase.COMPLETED_VALUE:
+			return R4EReviewPhase.REWORK;
 
 		default:
 			//should never happen
@@ -401,33 +400,33 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 		final List<R4EReviewPhase> phases = new ArrayList<R4EReviewPhase>();
 
 		switch (aCurrentPhase.getValue()) {
-		case R4EReviewPhase.R4E_REVIEW_PHASE_STARTED_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION);
+		case R4EReviewPhase.STARTED_VALUE:
+			phases.add(R4EReviewPhase.STARTED);
+			phases.add(R4EReviewPhase.PREPARATION);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION);
+		case R4EReviewPhase.PREPARATION_VALUE:
+			phases.add(R4EReviewPhase.PREPARATION);
+			phases.add(R4EReviewPhase.DECISION);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_DECISION_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+		case R4EReviewPhase.DECISION_VALUE:
+			phases.add(R4EReviewPhase.PREPARATION);
+			phases.add(R4EReviewPhase.DECISION);
+			phases.add(R4EReviewPhase.REWORK);
+			phases.add(R4EReviewPhase.COMPLETED);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_REWORK_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+		case R4EReviewPhase.REWORK_VALUE:
+			phases.add(R4EReviewPhase.DECISION);
+			phases.add(R4EReviewPhase.REWORK);
+			phases.add(R4EReviewPhase.COMPLETED);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+		case R4EReviewPhase.COMPLETED_VALUE:
+			phases.add(R4EReviewPhase.DECISION);
+			phases.add(R4EReviewPhase.REWORK);
+			phases.add(R4EReviewPhase.COMPLETED);
 			break;
 
 		default:
@@ -448,21 +447,21 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 		final List<R4EReviewPhase> phases = new ArrayList<R4EReviewPhase>();
 
 		switch (aCurrentPhase.getValue()) {
-		case R4EReviewPhase.R4E_REVIEW_PHASE_STARTED_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION);
+		case R4EReviewPhase.STARTED_VALUE:
+			phases.add(R4EReviewPhase.PREPARATION);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION);
+		case R4EReviewPhase.PREPARATION_VALUE:
+			phases.add(R4EReviewPhase.DECISION);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_DECISION_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK);
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+		case R4EReviewPhase.DECISION_VALUE:
+			phases.add(R4EReviewPhase.REWORK);
+			phases.add(R4EReviewPhase.COMPLETED);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_REWORK_VALUE:
-			phases.add(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+		case R4EReviewPhase.REWORK_VALUE:
+			phases.add(R4EReviewPhase.COMPLETED);
 			break;
 
 		default:
@@ -484,30 +483,30 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 		boolean clearOldPhaseData = false;
 
 		switch (aNewPhase.getValue()) {
-		case R4EReviewPhase.R4E_REVIEW_PHASE_STARTED_VALUE:
+		case R4EReviewPhase.STARTED_VALUE:
 			//nothing to do
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION_VALUE:
-			if (aOldPhaseInfo.getType().equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)) {
+		case R4EReviewPhase.PREPARATION_VALUE:
+			if (aOldPhaseInfo.getType().equals(R4EReviewPhase.DECISION)) {
 				clearOldPhaseData = true;
 			}
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_DECISION_VALUE:
-			if (aOldPhaseInfo.getType().equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)
-					|| aOldPhaseInfo.getType().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		case R4EReviewPhase.DECISION_VALUE:
+			if (aOldPhaseInfo.getType().equals(R4EReviewPhase.REWORK)
+					|| aOldPhaseInfo.getType().equals(R4EReviewPhase.COMPLETED)) {
 				clearOldPhaseData = true;
 			}
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_REWORK_VALUE:
-			if (aOldPhaseInfo.getType().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		case R4EReviewPhase.REWORK_VALUE:
+			if (aOldPhaseInfo.getType().equals(R4EReviewPhase.COMPLETED)) {
 				clearOldPhaseData = true;
 			}
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED_VALUE:
+		case R4EReviewPhase.COMPLETED_VALUE:
 			//nothing to do
 			break;
 
@@ -542,12 +541,12 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 		}
 
 		switch (aNextPhase.getValue()) {
-		case R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION_VALUE:
+		case R4EReviewPhase.PREPARATION_VALUE:
 			//No other constraint
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_DECISION_VALUE:
-			if (((R4EFormalReview) fReview).getCurrent().getType().equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
+		case R4EReviewPhase.DECISION_VALUE:
+			if (((R4EFormalReview) fReview).getCurrent().getType().equals(R4EReviewPhase.PREPARATION)) {
 				//Check if all reviewers are done, otherwise do not prevent phase change, but notify phase owner
 				final Collection<R4EUser> users = fReview.getUsersMap().values();
 				final List<String> pendingUsers = new ArrayList<String>();
@@ -564,13 +563,13 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 			}
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_REWORK_VALUE:
+		case R4EReviewPhase.REWORK_VALUE:
 			if (!checkReworkStatus(aErrorMessage)) {
 				return false;
 			}
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED_VALUE:
+		case R4EReviewPhase.COMPLETED_VALUE:
 			if (!checkCompletionStatus(aErrorMessage)) {
 				return false;
 			}
@@ -595,12 +594,12 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 					+ " as review exit decision information is missing");
 			return false;
 		}
-		if (fReview.getDecision().getValue().equals(R4EDecision.R4E_REVIEW_DECISION_NONE)) {
+		if (fReview.getDecision().getValue().equals(R4EDecision.NONE)) {
 			aErrorMessage.set("Phase cannot be changed to " + REVIEW_PHASE_REWORK
 					+ " as review exit decision information is set to NONE");
 			return false;
 		}
-		if (fReview.getDecision().getValue().equals(R4EDecision.R4E_REVIEW_DECISION_REJECTED)) {
+		if (fReview.getDecision().getValue().equals(R4EDecision.REJECTED)) {
 			aErrorMessage.set("Phase cannot be changed to " + REVIEW_PHASE_REWORK
 					+ " as review exit decision information is set to REJECTED");
 			return false;
@@ -646,7 +645,7 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 	 * @return boolean
 	 */
 	public boolean isParticipantExtraDetailsEnabled() {
-		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 		return true;
@@ -658,7 +657,7 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 	 * @return boolean
 	 */
 	public boolean isParticipantTimeSpentEnabled() {
-		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 		return true;
@@ -670,7 +669,7 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 	 * @return boolean
 	 */
 	public boolean isPreparationDateEnabled() {
-		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)) {
+		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.PREPARATION)) {
 			return true;
 		}
 		return false;
@@ -682,8 +681,8 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 	 * @return boolean
 	 */
 	public boolean isDecisionDateEnabled() {
-		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION)
-				|| ((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
+		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.DECISION)
+				|| ((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.REWORK)) {
 			return true;
 		}
 		return false;
@@ -695,7 +694,7 @@ public class R4EUIReviewExtended extends R4EUIReviewBasic {
 	 * @return boolean
 	 */
 	public boolean isReworkDateEnabled() {
-		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK)) {
+		if (((R4EReviewState) fReview.getState()).getState().equals(R4EReviewPhase.REWORK)) {
 			return true;
 		}
 		return false;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewGroup.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewGroup.java
index 53bf91ed..d8b1b336 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewGroup.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewGroup.java
@@ -24,12 +24,11 @@ import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.reviews.frame.core.model.Review;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReview;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EDecision;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReview;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
@@ -39,10 +38,12 @@ import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewState;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewType;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelFactory;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.RModelFactoryExt;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
+import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
 import org.eclipse.mylyn.reviews.r4e.ui.R4EUIPlugin;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs.IReviewInputDialog;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs.R4EUIDialogFactory;
@@ -258,7 +259,7 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#setModelData(R4EReviewComponent)
 	 */
 	@Override
-	public void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
+	public void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
 		//Set data in model element
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fGroup, R4EUIModelController.getReviewer());
 		fGroup.setDescription(((R4EReviewGroup) aModelComponent).getDescription());
@@ -276,9 +277,9 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildModelDataElement()
 	 */
 	@Override
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//Get comment from user and set it in model data
-		final List<ReviewComponent> tempReviews = new ArrayList<ReviewComponent>();
+		final List<IReviewComponent> tempReviews = new ArrayList<IReviewComponent>();
 
 		final IReviewInputDialog dialog = R4EUIDialogFactory.getInstance().getReviewInputDialog(this);
 		dialog.create();
@@ -288,7 +289,7 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 
 			//All reviews
 			final R4EReviewType type = dialog.getReviewTypeValue();
-			if (type.equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
+			if (type.equals(R4EReviewType.FORMAL)) {
 				tempReview = RModelFactory.eINSTANCE.createR4EFormalReview();
 			} else {
 				tempReview = RModelFactory.eINSTANCE.createR4EReview();
@@ -306,10 +307,10 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 			tempReview.setReferenceMaterial(dialog.getReferenceMaterialValue());
 			//Set default exit decision for INFORMAL review
 			final R4EReviewDecision reviewDecision = RModelFactoryExt.eINSTANCE.createR4EReviewDecision();
-			if (type.equals(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL)) {
-				reviewDecision.setValue(R4EDecision.R4E_REVIEW_DECISION_ACCEPTED);
+			if (type.equals(R4EReviewType.INFORMAL)) {
+				reviewDecision.setValue(R4EDecision.ACCEPTED);
 			} else {
-				reviewDecision.setValue(R4EDecision.R4E_REVIEW_DECISION_NONE);
+				reviewDecision.setValue(R4EDecision.NONE);
 			}
 
 			tempReview.setDecision(reviewDecision);
@@ -356,7 +357,7 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 		//Load model information
 		fGroup = R4EUIModelController.FModelExt.openR4EReviewGroup(fGroupFileURI);
 		if (checkCompatibility()) {
-			final EList<Review> reviews = fGroup.getReviews();
+			final List<IReview> reviews = fGroup.getReviews();
 			if (null != reviews) {
 				final int reviewsSize = reviews.size();
 				R4EReview review = null;
@@ -369,7 +370,7 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 									.getPreferenceStore()
 									.getBoolean(PreferenceConstants.P_SHOW_DISABLED)) {
 						uiReview = null;
-						if (review.getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
+						if (review.getType().equals(R4EReviewType.FORMAL)) {
 							uiReview = new R4EUIReviewExtended(this, review, review.getType(), false);
 							((R4EUIReviewExtended) uiReview).setName(((R4EUIReviewExtended) uiReview).getPhaseString(((R4EReviewState) review.getState()).getState())
 									+ ": " + uiReview.getName());
@@ -404,21 +405,21 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 	 * @return boolean
 	 */
 	private boolean checkCompatibility() {
-		final int checkResult = fGroup.getCompatibility();
+		String currentVersion = Persistence.Roots.GROUP.getVersion();
+		int checkResult = VersionUtils.compareVersions(currentVersion, fGroup.getFragmentVersion());
 		switch (checkResult) {
 		case R4EUIConstants.VERSION_APPLICATION_OLDER:
 			UIUtils.displayCompatibilityErrorDialog();
 			return false;
 		case R4EUIConstants.VERSION_APPLICATION_NEWER:
-			final int result = UIUtils.displayCompatibilityWarningDialog(fGroup.getFragmentVersion(),
-					fGroup.getApplicationVersion());
+			final int result = UIUtils.displayCompatibilityWarningDialog(fGroup.getFragmentVersion(), currentVersion);
 			switch (result) {
 			case R4EUIConstants.OPEN_NORMAL:
 				//Upgrade version immediately
 				try {
 					final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fGroup,
 							R4EUIModelController.getReviewer());
-					fGroup.setFragmentVersion(fGroup.getApplicationVersion());
+					fGroup.setFragmentVersion(currentVersion);
 					R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 				} catch (ResourceHandlingException e) {
 					UIUtils.displayResourceErrorDialog(e);
@@ -515,7 +516,7 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(R4EReviewComponent)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException {
 
 		final String reviewName = ((R4EReview) aModelComponent).getName();
@@ -537,14 +538,14 @@ public class R4EUIReviewGroup extends R4EUIModelElement {
 		}
 
 		final R4EUIReviewBasic addedChild;
-		if (type.equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL)) {
+		if (type.equals(R4EReviewType.FORMAL)) {
 			addedChild = new R4EUIReviewExtended(this, R4EUIModelController.FModelExt.createR4EFormalReview(
 					getReviewGroup(), reviewName, R4EUIModelController.getReviewer()), type, true);
-			((R4EUIReviewExtended) addedChild).updatePhase(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED);
+			((R4EUIReviewExtended) addedChild).updatePhase(R4EReviewPhase.STARTED);
 		} else {
 			addedChild = new R4EUIReviewBasic(this, R4EUIModelController.FModelExt.createR4EReview(getReviewGroup(),
 					reviewName, R4EUIModelController.getReviewer()), type, true);
-			addedChild.updatePhase(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED);
+			addedChild.updatePhase(R4EReviewPhase.STARTED);
 		}
 		addedChild.setModelData(aModelComponent);
 		addChildren(addedChild);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewItem.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewItem.java
index 005c34ea..8068ccd1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewItem.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewItem.java
@@ -20,7 +20,6 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EContextType;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EDelta;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileContext;
@@ -208,7 +207,7 @@ public class R4EUIReviewItem extends R4EUIFileContainer {
 			//assign participants
 			final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fItem,
 					R4EUIModelController.getReviewer());
-			final EList<String> assignedParticipants = fItem.getAssignedTo();
+			final List<String> assignedParticipants = fItem.getAssignedTo();
 			for (R4EParticipant participant : aParticipants) {
 				assignedParticipants.add(participant.getId());
 				((R4EUIReviewBasic) getParent()).getParticipant(participant.getId(), true);
@@ -239,7 +238,7 @@ public class R4EUIReviewItem extends R4EUIFileContainer {
 			//unassign participants
 			final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fItem,
 					R4EUIModelController.getReviewer());
-			final EList<String> assignedParticipants = fItem.getAssignedTo();
+			final List<String> assignedParticipants = fItem.getAssignedTo();
 			for (R4EParticipant participant : aParticipants) {
 				assignedParticipants.remove(participant.getId());
 			}
@@ -425,7 +424,7 @@ public class R4EUIReviewItem extends R4EUIFileContainer {
 	public boolean isRemoveElementCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -473,7 +472,7 @@ public class R4EUIReviewItem extends R4EUIFileContainer {
 		if (isEnabled()
 				|| isReadOnly()
 				|| ((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+						R4EReviewPhase.COMPLETED)) {
 			return false;
 		}
 		return true;
@@ -489,7 +488,7 @@ public class R4EUIReviewItem extends R4EUIFileContainer {
 	public boolean isChangeUserReviewStateCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -505,7 +504,7 @@ public class R4EUIReviewItem extends R4EUIFileContainer {
 	public boolean isAssignToCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))) {
+				&& !(((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))) {
 			return true;
 		}
 		return false;
@@ -521,7 +520,7 @@ public class R4EUIReviewItem extends R4EUIFileContainer {
 	public boolean isUnassignToCmd() {
 		if (isEnabled()
 				&& !isReadOnly()
-				&& !(((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED))
+				&& !(((R4EReviewState) ((R4EUIReviewBasic) getParent()).getReview().getState()).getState().equals(R4EReviewPhase.COMPLETED))
 				&& fItem.getAssignedTo().size() > 0) {
 			return true;
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRootElement.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRootElement.java
index 025f5c03..12c394af 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRootElement.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRootElement.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.core.model.RModelFactory;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelFactory;
@@ -104,9 +104,9 @@ public class R4EUIRootElement extends R4EUIModelElement {
 	 * @throws ResourceHandlingException
 	 */
 	@Override
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//Get comment from user and set it in model data
-		final List<ReviewComponent> tempReviewGroups = new ArrayList<ReviewComponent>();
+		final List<IReviewComponent> tempReviewGroups = new ArrayList<IReviewComponent>();
 
 		final IReviewGroupInputDialog dialog = R4EUIDialogFactory.getInstance().getReviewGroupInputDialog();
 		dialog.create();
@@ -138,7 +138,7 @@ public class R4EUIRootElement extends R4EUIModelElement {
 	 * @throws OutOfSyncException
 	 * @throws ResourceHandlingException
 	 */
-	public ReviewComponent createRuleSetElement() {
+	public IReviewComponent createRuleSetElement() {
 		//Get comment from user and set it in model data
 		R4EDesignRuleCollection tempRuleSet = null;
 		final IRuleSetInputDialog dialog = R4EUIDialogFactory.getInstance().getRuleSetInputDialog();
@@ -281,7 +281,7 @@ public class R4EUIRootElement extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(ReviewNavigatorContentProvider)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException {
 
 		if (aModelComponent instanceof R4EReviewGroup) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRule.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRule.java
index f8ed7310..c4220f2f 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRule.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRule.java
@@ -18,7 +18,7 @@
 
 package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
@@ -155,7 +155,7 @@ public class R4EUIRule extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#setModelData(R4EReviewComponent)
 	 */
 	@Override
-	public void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
+	public void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
 		//Set data in model element
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fRule, R4EUIModelController.getReviewer());
 		fRule.setId(((R4EDesignRule) aModelComponent).getId());
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleArea.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleArea.java
index e9308bfb..e3c8edec 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleArea.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleArea.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelFactory;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
@@ -165,9 +165,9 @@ public class R4EUIRuleArea extends R4EUIModelElement {
 	 * @return the new serialization element object
 	 */
 	@Override
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//Get Rule Violations from user and set it in model data
-		final List<ReviewComponent> tempViolations = new ArrayList<ReviewComponent>();
+		final List<IReviewComponent> tempViolations = new ArrayList<IReviewComponent>();
 
 		final IRuleViolationInputDialog dialog = R4EUIDialogFactory.getInstance().getRuleViolationInputDialog();
 		final int result = dialog.open();
@@ -309,7 +309,7 @@ public class R4EUIRuleArea extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(ReviewNavigatorContentProvider)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException {
 		final R4EDesignRuleViolation violation = R4EUIModelController.FModelExt.createR4EDesignRuleViolation(fArea);
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(violation,
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleSet.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleSet.java
index 60c7ef3d..415836a3 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleSet.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleSet.java
@@ -23,14 +23,16 @@ import java.util.List;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelFactory;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleArea;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleCollection;
+import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.CompatibilityException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
+import org.eclipse.mylyn.reviews.r4e.core.utils.VersionUtils;
 import org.eclipse.mylyn.reviews.r4e.ui.R4EUIPlugin;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs.IRuleAreaInputDialog;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs.R4EUIDialogFactory;
@@ -221,7 +223,7 @@ public class R4EUIRuleSet extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#setModelData(R4EReviewComponent)
 	 */
 	@Override
-	public void setModelData(ReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
+	public void setModelData(IReviewComponent aModelComponent) throws ResourceHandlingException, OutOfSyncException {
 		//Set data in model element
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fRuleSet,
 				R4EUIModelController.getReviewer());
@@ -235,9 +237,9 @@ public class R4EUIRuleSet extends R4EUIModelElement {
 	 * @return the new serialization element object
 	 */
 	@Override
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//Get Rule Area from user and set it in model data
-		final List<ReviewComponent> tempAreas = new ArrayList<ReviewComponent>();
+		final List<IReviewComponent> tempAreas = new ArrayList<IReviewComponent>();
 
 		final IRuleAreaInputDialog dialog = R4EUIDialogFactory.getInstance().getRuleAreaInputDialog();
 		final int result = dialog.open();
@@ -350,7 +352,8 @@ public class R4EUIRuleSet extends R4EUIModelElement {
 	 */
 	public boolean openReadOnly() throws ResourceHandlingException, CompatibilityException {
 		fRuleSet = R4EUIModelController.FModelExt.openR4EDesignRuleCollection(fRuleSetFileURI);
-		final int checkResult = fRuleSet.getCompatibility();
+		String currentVersion = Persistence.Roots.RULESET.getVersion();
+		int checkResult = VersionUtils.compareVersions(currentVersion, fRuleSet.getFragmentVersion());
 		if (checkResult == R4EUIConstants.VERSION_APPLICATION_OLDER) {
 			R4EUIModelController.FModelExt.closeR4EDesignRuleCollection(fRuleSet);
 			return false;
@@ -387,21 +390,21 @@ public class R4EUIRuleSet extends R4EUIModelElement {
 	 * @return boolean
 	 */
 	private boolean checkCompatibility() {
-		final int checkResult = fRuleSet.getCompatibility();
+		String currentVersion = Persistence.Roots.RULESET.getVersion();
+		int checkResult = VersionUtils.compareVersions(currentVersion, fRuleSet.getFragmentVersion());
 		switch (checkResult) {
 		case R4EUIConstants.VERSION_APPLICATION_OLDER:
 			UIUtils.displayCompatibilityErrorDialog();
 			return false;
 		case R4EUIConstants.VERSION_APPLICATION_NEWER:
-			final int result = UIUtils.displayCompatibilityWarningDialog(fRuleSet.getFragmentVersion(),
-					fRuleSet.getApplicationVersion());
+			final int result = UIUtils.displayCompatibilityWarningDialog(fRuleSet.getFragmentVersion(), currentVersion);
 			switch (result) {
 			case R4EUIConstants.OPEN_NORMAL:
 				//Upgrade version immediately
 				try {
 					final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(fRuleSet,
 							R4EUIModelController.getReviewer());
-					fRuleSet.setFragmentVersion(fRuleSet.getApplicationVersion());
+					fRuleSet.setFragmentVersion(currentVersion);
 					R4EUIModelController.FResourceUpdater.checkIn(bookNum);
 				} catch (ResourceHandlingException e) {
 					UIUtils.displayResourceErrorDialog(e);
@@ -481,7 +484,7 @@ public class R4EUIRuleSet extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(ReviewNavigatorContentProvider)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException {
 		final R4EDesignRuleArea area = R4EUIModelController.FModelExt.createR4EDesignRuleArea(fRuleSet);
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(area, R4EUIModelController.getReviewer());
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleViolation.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleViolation.java
index 8176560e..aec21d89 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleViolation.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIRuleViolation.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
+import org.eclipse.mylyn.reviews.core.model.IReviewComponent;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.DRModelFactory;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRule;
 import org.eclipse.mylyn.reviews.r4e.core.model.drules.R4EDesignRuleViolation;
@@ -166,9 +166,9 @@ public class R4EUIRuleViolation extends R4EUIModelElement {
 	 * @return the new serialization element object
 	 */
 	@Override
-	public List<ReviewComponent> createChildModelDataElement() {
+	public List<IReviewComponent> createChildModelDataElement() {
 		//Get Rule from user and set it in model data
-		final List<ReviewComponent> tempRules = new ArrayList<ReviewComponent>();
+		final List<IReviewComponent> tempRules = new ArrayList<IReviewComponent>();
 
 		final IRuleInputDialog dialog = R4EUIDialogFactory.getInstance().getRuleInputDialog(getViolation());
 		final int result = dialog.open();
@@ -312,7 +312,7 @@ public class R4EUIRuleViolation extends R4EUIModelElement {
 	 * @see org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement#createChildren(ReviewNavigatorContentProvider)
 	 */
 	@Override
-	public IR4EUIModelElement createChildren(ReviewComponent aModelComponent) throws ResourceHandlingException,
+	public IR4EUIModelElement createChildren(IReviewComponent aModelComponent) throws ResourceHandlingException,
 			OutOfSyncException {
 		final R4EDesignRule rule = R4EUIModelController.FModelExt.createR4EDesignRule(fViolation);
 		final Long bookNum = R4EUIModelController.FResourceUpdater.checkOut(rule, R4EUIModelController.getReviewer());
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUISelectionContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUISelectionContainer.java
index 4d480f84..69a925b7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUISelectionContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUISelectionContainer.java
@@ -21,7 +21,6 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EDelta;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4ETextPosition;
@@ -99,7 +98,7 @@ public class R4EUISelectionContainer extends R4EUIContentsContainer {
 		addChildren(uiSelection);
 
 		//If parent file is assigned, assign the Selection too
-		final EList<String> parentAssignedParticipants = ((R4EUIFileContext) getParent()).getFileContext()
+		final List<String> parentAssignedParticipants = ((R4EUIFileContext) getParent()).getFileContext()
 				.getAssignedTo();
 		final List<R4EParticipant> participantsToAssign = new ArrayList<R4EParticipant>();
 		for (String parentAssignedParticipant : parentAssignedParticipants) {
@@ -125,7 +124,7 @@ public class R4EUISelectionContainer extends R4EUIContentsContainer {
 	 */
 	@Override
 	public void open() {
-		final EList<R4EDelta> selections = ((R4EUIFileContext) getParent()).getFileContext().getDeltas();
+		final List<R4EDelta> selections = ((R4EUIFileContext) getParent()).getFileContext().getDeltas();
 		if (null != selections) {
 			R4EUITextPosition position = null;
 			R4EUISelection newSelection = null;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/navigator/R4EUILegendDialog.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/navigator/R4EUILegendDialog.java
index 8db7ff4b..eb536c2a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/navigator/R4EUILegendDialog.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/navigator/R4EUILegendDialog.java
@@ -85,7 +85,7 @@ public class R4EUILegendDialog extends PopupDialog {
 	@Override
 	public int open() {
 		final int open = super.open();
-//		getShell().setLocation(getShell().getLocation().x, getShell().getLocation().y+20);
+//		getShell().setLocation(getShell().getLocations().x, getShell().getLocations().y+20);
 		getShell().setFocus();
 		return open;
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/navigator/ReviewNavigatorDecorator.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/navigator/ReviewNavigatorDecorator.java
index 12dd6b4a..281c4b94 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/navigator/ReviewNavigatorDecorator.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/navigator/ReviewNavigatorDecorator.java
@@ -298,7 +298,7 @@ public class ReviewNavigatorDecorator implements ILabelDecorator, IFontDecorator
 	public Color decorateForeground(Object aElement) {
 		if (aElement instanceof R4EUIReviewBasic) {
 			if (((R4EReviewState) ((R4EUIReviewBasic) aElement).getReview().getState()).getState().equals(
-					R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+					R4EReviewPhase.COMPLETED)) {
 				return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GRAY);
 			}
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/R4EPreferencePage.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/R4EPreferencePage.java
index a8db6743..caa83577 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/R4EPreferencePage.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/preferences/R4EPreferencePage.java
@@ -1125,7 +1125,7 @@ public class R4EPreferencePage extends FieldEditorPreferencePage implements IWor
 	 * 
 	 * @return String
 	 */
-	public String getUser() {
+	public String getAuthor() {
 		return fUserIdTextField.getText();
 
 	}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/AnomalyBasicProperties.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/AnomalyBasicProperties.java
index a2712ccb..e7bd4aae 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/AnomalyBasicProperties.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/AnomalyBasicProperties.java
@@ -202,7 +202,7 @@ public class AnomalyBasicProperties extends ModelElementProperties {
 			}
 			return ((R4EUIAnomalyBasic) getElement()).getPosition().toString();
 		} else if (ANOMALY_AUTHOR_ID.equals(aId)) {
-			return ((R4EUIAnomalyBasic) getElement()).getAnomaly().getUser().getId();
+			return ((R4EUIAnomalyBasic) getElement()).getAnomaly().getAuthor().getId();
 		} else if (ANOMALY_CREATION_DATE_ID.equals(aId)) {
 			return ((R4EUIAnomalyBasic) getElement()).getAnomaly().getCreatedOn().toString();
 		} else if (ANOMALY_DESCRIPTION_ID.equals(aId)) {
@@ -219,8 +219,8 @@ public class AnomalyBasicProperties extends ModelElementProperties {
 		} else if (ANOMALY_RANK_ID.equals(aId)) {
 			//Bug 368865:  Mapping needed for DEPRECATED value to MINOR
 			final int rankValue = ((R4EUIAnomalyBasic) getElement()).getAnomaly().getRank().getValue();
-			final int intValue = Integer.valueOf(rankValue == R4EDesignRuleRank.R4E_RANK_DEPRECATED_VALUE
-					? R4EDesignRuleRank.R4E_RANK_MINOR_VALUE
+			final int intValue = Integer.valueOf(rankValue == R4EDesignRuleRank.DEPRECATED_VALUE
+					? R4EDesignRuleRank.MINOR_VALUE
 					: rankValue);
 			return UIUtils.getRanks()[intValue];
 		} else if (ANOMALY_RULE_ID_ID.equals(aId)) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/CommentProperties.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/CommentProperties.java
index ae37446f..12601fde 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/CommentProperties.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/CommentProperties.java
@@ -112,7 +112,7 @@ public class CommentProperties extends ModelElementProperties {
 	@Override
 	public Object getPropertyValue(Object aId) {
 		if (COMMENT_AUTHOR_ID.equals(aId)) {
-			return ((R4EUIComment) getElement()).getComment().getUser().getId();
+			return ((R4EUIComment) getElement()).getComment().getAuthor().getId();
 		} else if (COMMENT_CREATION_DATE_ID.equals(aId)) {
 			return ((R4EUIComment) getElement()).getComment().getCreatedOn().toString();
 		} else if (COMMENT_DESCRIPTION_ID.equals(aId)) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ParticipantProperties.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ParticipantProperties.java
index 063cf901..57bd039a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ParticipantProperties.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ParticipantProperties.java
@@ -18,9 +18,9 @@
 package org.eclipse.mylyn.reviews.r4e.ui.internal.properties.general;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map.Entry;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
@@ -206,16 +206,16 @@ public class ParticipantProperties extends ModelElementProperties {
 	 * @return String
 	 */
 	private String mapUserRole(R4EUserRole aRole) {
-		if (aRole.equals(R4EUserRole.R4E_ROLE_AUTHOR)) {
+		if (aRole.equals(R4EUserRole.AUTHOR)) {
 			return AUTHOR;
 		}
-		if (aRole.equals(R4EUserRole.R4E_ROLE_LEAD)) {
+		if (aRole.equals(R4EUserRole.LEAD)) {
 			return LEAD;
 		}
-		if (aRole.equals(R4EUserRole.R4E_ROLE_ORGANIZER)) {
+		if (aRole.equals(R4EUserRole.ORGANIZER)) {
 			return ORGANIZER;
 		}
-		if (aRole.equals(R4EUserRole.R4E_ROLE_REVIEWER)) {
+		if (aRole.equals(R4EUserRole.REVIEWER)) {
 			return REVIEWER;
 		} else {
 			return "";
@@ -241,7 +241,7 @@ public class ParticipantProperties extends ModelElementProperties {
 			return Integer.valueOf(((R4EUIParticipant) getElement()).getParticipant().getAddedItems().size());
 		} else if (PARTICIPANT_NUM_ANOMALIES_ID.equals(aId)) {
 			int numAnomalies = 0;
-			final EList<R4EComment> comments = ((R4EUIParticipant) getElement()).getParticipant().getAddedComments();
+			final List<R4EComment> comments = ((R4EUIParticipant) getElement()).getParticipant().getAddedComments();
 			final int commentsSize = comments.size();
 			for (int i = 0; i < commentsSize; i++) {
 				if (comments.get(i) instanceof R4EAnomaly) {
@@ -251,7 +251,7 @@ public class ParticipantProperties extends ModelElementProperties {
 			return Integer.valueOf(numAnomalies);
 		} else if (PARTICIPANT_NUM_COMMENTS_ID.equals(aId)) {
 			int numComments = 0;
-			final EList<R4EComment> comments = ((R4EUIParticipant) getElement()).getParticipant().getAddedComments();
+			final List<R4EComment> comments = ((R4EUIParticipant) getElement()).getParticipant().getAddedComments();
 			final int commentsSize = comments.size();
 			for (int i = 0; i < commentsSize; i++) {
 				if (!(comments.get(i) instanceof R4EAnomaly)) {
@@ -263,16 +263,13 @@ public class ParticipantProperties extends ModelElementProperties {
 			return ((R4EUIParticipant) getElement()).getParticipantDetails();
 		} else if (PARTICIPANT_TIME_SPENT_ID.equals(aId)) {
 			final R4EParticipant modelUser = ((R4EUIParticipant) getElement()).getParticipant();
-			final int numTimeEntries = modelUser.getTimeLog().size();
 			int totalTimeSpent = 0;
-			Entry<Date, Integer> timeEntry = null;
-			for (int i = 0; i < numTimeEntries; i++) {
-				timeEntry = modelUser.getTimeLog().get(i);
+			for (Entry<Date, Integer> timeEntry : modelUser.getTimeLog().entrySet()) {
 				totalTimeSpent += timeEntry.getValue().intValue();
 			}
 			return Integer.toString(totalTimeSpent);
 		} else if (PARTICIPANT_ROLES_ID.equals(aId)) {
-			final EList<R4EUserRole> roles = ((R4EUIParticipant) getElement()).getParticipant().getRoles();
+			final List<R4EUserRole> roles = ((R4EUIParticipant) getElement()).getParticipant().getRoles();
 			final StringBuilder rolesStr = new StringBuilder();
 			for (R4EUserRole role : roles) {
 				rolesStr.append(mapUserRole(role) + ", ");
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/RuleProperties.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/RuleProperties.java
index dff03672..ed3d0f97 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/RuleProperties.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/RuleProperties.java
@@ -149,8 +149,8 @@ public class RuleProperties extends ModelElementProperties {
 			} else if (RULE_RANK_ID.equals(aId)) {
 				//Bug 368865:  Mapping needed for DEPRECATED value to MINOR
 				final int rankValue = ((R4EUIRule) getElement()).getRule().getRank().getValue();
-				final int intValue = Integer.valueOf(rankValue == R4EDesignRuleRank.R4E_RANK_DEPRECATED_VALUE
-						? R4EDesignRuleRank.R4E_RANK_MINOR_VALUE
+				final int intValue = Integer.valueOf(rankValue == R4EDesignRuleRank.DEPRECATED_VALUE
+						? R4EDesignRuleRank.MINOR_VALUE
 						: rankValue);
 				return UIUtils.getRanks()[intValue];
 			}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/AnomalyTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/AnomalyTabPropertySection.java
index f9b35540..a79044c3 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/AnomalyTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/AnomalyTabPropertySection.java
@@ -340,8 +340,8 @@ public class AnomalyTabPropertySection extends ModelElementTabPropertySection {
 					final R4EAnomalyState oldState = ((R4EUIAnomalyBasic) fProperties.getElement()).getAnomaly()
 							.getState();
 					if (!newState.equals(oldState)) {
-						if (newState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)
-								&& !oldState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)) {
+						if (newState.equals(R4EAnomalyState.REJECTED)
+								&& !oldState.equals(R4EAnomalyState.REJECTED)) {
 							final boolean commentResult = ((R4EUIAnomalyBasic) fProperties.getElement()).createComment(true);
 							if (commentResult) {
 								UIUtils.changeAnomalyState(fProperties.getElement(), newState);
@@ -950,7 +950,7 @@ public class AnomalyTabPropertySection extends ModelElementTabPropertySection {
 		final R4EUIAnomalyBasic uiModelAnomaly = (R4EUIAnomalyBasic) fProperties.getElement();
 		final R4EAnomaly modelAnomaly = uiModelAnomaly.getAnomaly();
 		fTitleText.setText(modelAnomaly.getTitle());
-		fAuthorText.setText(modelAnomaly.getUser().getId());
+		fAuthorText.setText(modelAnomaly.getAuthor().getId());
 		fCreationDateText.setText(modelAnomaly.getCreatedOn().toString());
 		fPosition = ((R4EUIAnomalyBasic) fProperties.getElement()).getPosition();
 		if (null == fPosition) {
@@ -992,8 +992,8 @@ public class AnomalyTabPropertySection extends ModelElementTabPropertySection {
 		fRankCombo.setItems(UIUtils.getRanks());
 		//Bug 368865:  Mapping needed for DEPRECATED value to MINOR
 		final int rankValue = modelAnomaly.getRank().getValue();
-		fRankCombo.select(rankValue == R4EDesignRuleRank.R4E_RANK_DEPRECATED_VALUE
-				? R4EDesignRuleRank.R4E_RANK_MINOR_VALUE
+		fRankCombo.select(rankValue == R4EDesignRuleRank.DEPRECATED_VALUE
+				? R4EDesignRuleRank.MINOR_VALUE
 				: rankValue);
 
 		if (null != modelAnomaly.getRuleID()) {
@@ -1071,7 +1071,7 @@ public class AnomalyTabPropertySection extends ModelElementTabPropertySection {
 				|| fProperties.getElement().isReadOnly()
 				|| null == R4EUIModelController.getActiveReview()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) || !fProperties.getElement().isEnabled()) {
+						R4EReviewPhase.COMPLETED) || !fProperties.getElement().isEnabled()) {
 			fTitleText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fTitleText.setEditable(false);
 			fAuthorText.setForeground(UIUtils.DISABLED_FONT_COLOR);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/CommentTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/CommentTabPropertySection.java
index 27fd18d3..85fb0a97 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/CommentTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/CommentTabPropertySection.java
@@ -159,7 +159,7 @@ public class CommentTabPropertySection extends ModelElementTabPropertySection {
 	public void refresh() {
 		fRefreshInProgress = true;
 		final R4EComment modelComment = ((R4EUIComment) fProperties.getElement()).getComment();
-		fAuthorText.setText(modelComment.getUser().getId());
+		fAuthorText.setText(modelComment.getAuthor().getId());
 		fCreationDateText.setText(modelComment.getCreatedOn().toString());
 		fDescriptionText.setText(modelComment.getDescription());
 		fDescriptionText.getParent().layout();
@@ -176,7 +176,7 @@ public class CommentTabPropertySection extends ModelElementTabPropertySection {
 				|| fProperties.getElement().isReadOnly()
 				|| null == R4EUIModelController.getActiveReview()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) || !fProperties.getElement().isEnabled()) {
+						R4EReviewPhase.COMPLETED) || !fProperties.getElement().isEnabled()) {
 			fAuthorText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fCreationDateText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fDescriptionText.setForeground(UIUtils.DISABLED_FONT_COLOR);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ContentsTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ContentsTabPropertySection.java
index 7a87717a..14b150be 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ContentsTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ContentsTabPropertySection.java
@@ -19,7 +19,8 @@
 
 package org.eclipse.mylyn.reviews.r4e.ui.internal.properties.tabbed;
 
-import org.eclipse.emf.common.util.EList;
+import java.util.List;
+
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewState;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIContent;
@@ -176,7 +177,7 @@ public class ContentsTabPropertySection extends ModelElementTabPropertySection {
 			fPositionText.setText("");
 		}
 
-		final EList<String> assignedParticipants = uiContent.getContent().getAssignedTo();
+		final List<String> assignedParticipants = uiContent.getContent().getAssignedTo();
 		fAssignedToText.setText(UIUtils.formatAssignedParticipants(assignedParticipants));
 		setEnabledFields();
 		fRefreshInProgress = false;
@@ -192,7 +193,7 @@ public class ContentsTabPropertySection extends ModelElementTabPropertySection {
 				|| !fProperties.getElement().isEnabled()
 				|| null == R4EUIModelController.getActiveReview()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED)) {
+						R4EReviewPhase.COMPLETED)) {
 			fPositionText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fAssignedToText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fAssignedToButton.setEnabled(false);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/FileContextTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/FileContextTabPropertySection.java
index abdece44..ec150240 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/FileContextTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/FileContextTabPropertySection.java
@@ -12,8 +12,9 @@
 
 package org.eclipse.mylyn.reviews.r4e.ui.internal.properties.tabbed;
 
+import java.util.List;
+
 import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileContext;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EFileVersion;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
@@ -518,7 +519,7 @@ public class FileContextTabPropertySection extends ModelElementTabPropertySectio
 			fTargetFileVersionText.setText("");
 		}
 
-		final EList<String> assignedParticipants = modelFile.getAssignedTo();
+		final List<String> assignedParticipants = modelFile.getAssignedTo();
 		fAssignedToText.setText(UIUtils.formatAssignedParticipants(assignedParticipants));
 
 		setEnabledFields();
@@ -541,7 +542,7 @@ public class FileContextTabPropertySection extends ModelElementTabPropertySectio
 				|| fProperties.getElement().isReadOnly()
 				|| null == R4EUIModelController.getActiveReview()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) || !fProperties.getElement().isEnabled()) {
+						R4EReviewPhase.COMPLETED) || !fProperties.getElement().isEnabled()) {
 			fBaseFileNameText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fBaseFilePathRepositoryText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fBaseFilePathAbsoluteText.setForeground(UIUtils.DISABLED_FONT_COLOR);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ParticipantTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ParticipantTabPropertySection.java
index e0d679c5..389e82c9 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ParticipantTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ParticipantTabPropertySection.java
@@ -18,13 +18,12 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
@@ -496,7 +495,7 @@ public class ParticipantTabPropertySection extends ModelElementTabPropertySectio
 
 		int numAnomalies = 0;
 		int numComments = 0;
-		final EList<R4EComment> comments = modelUser.getAddedComments();
+		final List<R4EComment> comments = modelUser.getAddedComments();
 		final int commentsSize = comments.size();
 		for (int i = 0; i < commentsSize; i++) {
 			if (comments.get(i) instanceof R4EAnomaly) {
@@ -522,8 +521,9 @@ public class ParticipantTabPropertySection extends ModelElementTabPropertySectio
 
 		final DateFormat dateFormat = new SimpleDateFormat(R4EUIConstants.DEFAULT_DATE_FORMAT);
 
+		Iterator<Entry<Date, Integer>> timeEntries = modelUser.getTimeLog().entrySet().iterator();
 		for (int i = 0; i < numTimeEntries; i++) {
-			timeEntry = modelUser.getTimeLog().get(i);
+			timeEntry = timeEntries.next();
 			if (i >= fTimeSpentDetailedList.getItemCount()) {
 				item = fTimeSpentDetailedList.addItem();
 			} else {
@@ -576,7 +576,7 @@ public class ParticipantTabPropertySection extends ModelElementTabPropertySectio
 				|| fProperties.getElement().isReadOnly()
 				|| null == R4EUIModelController.getActiveReview()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) || !fProperties.getElement().isEnabled()) {
+						R4EReviewPhase.COMPLETED) || !fProperties.getElement().isEnabled()) {
 			fIdText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fEmailText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fEmailText.setEditable(false);
@@ -621,7 +621,7 @@ public class ParticipantTabPropertySection extends ModelElementTabPropertySectio
 				if (R4EUIModelController.getActiveReview()
 						.getReview()
 						.getType()
-						.equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+						.equals(R4EReviewType.BASIC)) {
 					fTimeSection.setVisible(false);
 					fRolesSection.setVisible(false);
 				} else {
@@ -652,12 +652,12 @@ public class ParticipantTabPropertySection extends ModelElementTabPropertySectio
 
 			if (1 == aInstanceId) {
 				//Update spent time
-				final EMap<Date, Integer> timeMap = modelParticipant.getTimeLog();
+				final Map<Date, Integer> timeMap = modelParticipant.getTimeLog();
 				final DateFormat dateFormat = new SimpleDateFormat(R4EUIConstants.DEFAULT_DATE_FORMAT);
 				Map<Date, Integer> newAddTimes = new HashMap<Date, Integer>();
 				Map<Date, Integer> newDeleteTimes = new HashMap<Date, Integer>();
 				Map<Date, Integer> storedTimes = new HashMap<Date, Integer>();
-				storedTimes.putAll(modelParticipant.getTimeLog().map());
+				storedTimes.putAll(modelParticipant.getTimeLog());
 				for (Item item : aItems) {
 					try {
 						newAddTimes.put(dateFormat.parse(((TableItem) item).getText(1)),
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/PostponedAnomalyTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/PostponedAnomalyTabPropertySection.java
index dd6100c9..ffcd1c9d 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/PostponedAnomalyTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/PostponedAnomalyTabPropertySection.java
@@ -389,10 +389,10 @@ public class PostponedAnomalyTabPropertySection extends ModelElementTabPropertyS
 						R4EAnomalyState newState = R4EUIAnomalyExtended.getStateFromString(fStateCombo.getText());
 						if (!newState.equals(((R4EUIAnomalyBasic) fProperties.getElement()).getAnomaly().getState())) {
 							if (((R4EUIPostponedAnomaly) fProperties.getElement()).checkCompatibility()) {
-								if (newState.equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)
+								if (newState.equals(R4EAnomalyState.REJECTED)
 										&& !((R4EUIAnomalyBasic) fProperties.getElement()).getAnomaly()
 												.getState()
-												.equals(R4EAnomalyState.R4E_ANOMALY_STATE_REJECTED)) {
+												.equals(R4EAnomalyState.REJECTED)) {
 									//Force the user to enter a comment if the state is changed to REJECTED
 									final boolean commentResult = ((R4EUIAnomalyBasic) fProperties.getElement()).createComment(true);
 									if (commentResult) {
@@ -1029,7 +1029,7 @@ public class PostponedAnomalyTabPropertySection extends ModelElementTabPropertyS
 			fReviewNameText.setText(""); //$NON-NLS-1$
 		}
 		fTitleText.setText(modelAnomaly.getTitle());
-		fAuthorText.setText(modelAnomaly.getUser().getId());
+		fAuthorText.setText(modelAnomaly.getAuthor().getId());
 		fCreationDateText.setText(modelAnomaly.getCreatedOn().toString());
 		fPosition = ((R4EUIAnomalyBasic) fProperties.getElement()).getPosition();
 		if (null == fPosition) {
@@ -1063,8 +1063,8 @@ public class PostponedAnomalyTabPropertySection extends ModelElementTabPropertyS
 		fRankCombo.setItems(UIUtils.getRanks());
 		//Bug 368865:  Mapping needed for DEPRECATED value to MINOR
 		int rankValue = modelAnomaly.getRank().getValue();
-		fRankCombo.select(rankValue == R4EDesignRuleRank.R4E_RANK_DEPRECATED_VALUE
-				? R4EDesignRuleRank.R4E_RANK_MINOR_VALUE
+		fRankCombo.select(rankValue == R4EDesignRuleRank.DEPRECATED_VALUE
+				? R4EDesignRuleRank.MINOR_VALUE
 				: rankValue);
 
 		if (null != modelAnomaly.getRuleID()) {
@@ -1125,7 +1125,7 @@ public class PostponedAnomalyTabPropertySection extends ModelElementTabPropertyS
 				|| fProperties.getElement().isReadOnly()
 				|| null == R4EUIModelController.getActiveReview()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) || !fProperties.getElement().isEnabled()) {
+						R4EReviewPhase.COMPLETED) || !fProperties.getElement().isEnabled()) {
 			fReviewNameText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fTitleText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fTitleText.setEditable(false);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/PostponedFileTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/PostponedFileTabPropertySection.java
index b42f16c9..015e3fe4 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/PostponedFileTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/PostponedFileTabPropertySection.java
@@ -273,7 +273,7 @@ public class PostponedFileTabPropertySection extends ModelElementTabPropertySect
 				|| fProperties.getElement().isReadOnly()
 				|| null == R4EUIModelController.getActiveReview()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) || !fProperties.getElement().isEnabled()) {
+						R4EReviewPhase.COMPLETED) || !fProperties.getElement().isEnabled()) {
 			fOriginalFileNameText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fOriginalFilePathAbsoluteText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fOriginalFileVersionText.setForeground(UIUtils.DISABLED_FONT_COLOR);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewGroupTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewGroupTabPropertySection.java
index 97dd454d..b544d875 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewGroupTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewGroupTabPropertySection.java
@@ -15,7 +15,6 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.properties.tabbed;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.OutOfSyncException;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.impl.ResourceHandlingException;
@@ -422,7 +421,7 @@ public class ReviewGroupTabPropertySection extends ModelElementTabPropertySectio
 			fDescriptionText.setText("");
 		}
 
-		EList<String> availableProjects = modelGroup.getAvailableProjects();
+		List<String> availableProjects = modelGroup.getAvailableProjects();
 		final String[] projects = availableProjects.toArray(new String[availableProjects.size()]);
 		fAvailableProjects.removeAll();
 		Item item = null;
@@ -442,7 +441,7 @@ public class ReviewGroupTabPropertySection extends ModelElementTabPropertySectio
 		}
 		fAvailableProjects.updateButtons();
 
-		EList<String> availableComponents = modelGroup.getAvailableComponents();
+		List<String> availableComponents = modelGroup.getAvailableComponents();
 		final String[] components = availableComponents.toArray(new String[availableComponents.size()]);
 		fAvailableComponents.removeAll();
 		String component = null;
@@ -465,7 +464,7 @@ public class ReviewGroupTabPropertySection extends ModelElementTabPropertySectio
 		final List<R4EUIRuleSet> uiRuleSets = ((R4EUIRootElement) ((R4EUIReviewGroup) fProperties.getElement()).getParent()).getRuleSets();
 		final List<String> tmpRuleSetLocations = new ArrayList<String>();
 		//Fixed warning, see Bug 391614
-		EList<String> ruleLocations = modelGroup.getDesignRuleLocations();
+		List<String> ruleLocations = modelGroup.getDesignRuleLocations();
 		final String[] ruleSetsLocations = ruleLocations.toArray(new String[ruleLocations.size()]);
 		for (R4EUIRuleSet uiRuleSet : uiRuleSets) {
 			if (uiRuleSet.isEnabled()) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewItemTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewItemTabPropertySection.java
index 6ca3c3d0..e2e3dd02 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewItemTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewItemTabPropertySection.java
@@ -15,7 +15,6 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.properties.tabbed;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EItem;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EParticipant;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EReviewPhase;
@@ -340,7 +339,7 @@ public class ReviewItemTabPropertySection extends ModelElementTabPropertySection
 			}
 		}
 
-		EList<String> projects = modelItem.getProjectURIs();
+		java.util.List<String> projects = modelItem.getProjectURIs();
 		fProjectIdList.setItems(projects.toArray(new String[projects.size()]));
 		fRepositoryText.setText(null != modelItem.getRepositoryRef() ? modelItem.getRepositoryRef() : "");
 		if (null != modelItem.getSubmitted()) {
@@ -355,7 +354,7 @@ public class ReviewItemTabPropertySection extends ModelElementTabPropertySection
 			fDescriptionText.setText("");
 		}
 
-		final EList<String> assignedParticipants = modelItem.getAssignedTo();
+		final java.util.List<String> assignedParticipants = modelItem.getAssignedTo();
 		fAssignedToText.setText(UIUtils.formatAssignedParticipants(assignedParticipants));
 
 		setEnabledFields();
@@ -371,7 +370,7 @@ public class ReviewItemTabPropertySection extends ModelElementTabPropertySection
 				|| fProperties.getElement().isReadOnly()
 				|| null == R4EUIModelController.getActiveReview()
 				|| ((R4EReviewState) R4EUIModelController.getActiveReview().getReview().getState()).getState().equals(
-						R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) || !fProperties.getElement().isEnabled()) {
+						R4EReviewPhase.COMPLETED) || !fProperties.getElement().isEnabled()) {
 			fAuthorText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fAuthorRepText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fRepositoryText.setForeground(UIUtils.DISABLED_FONT_COLOR);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
index c4fae702..5f5d81ea 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
@@ -990,7 +990,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 							//Create decision if it does not already exists
 							if (null == modelReview.getDecision()) {
 								final R4EReviewDecision reviewDecision = RModelFactoryExt.eINSTANCE.createR4EReviewDecision();
-								reviewDecision.setValue(R4EDecision.R4E_REVIEW_DECISION_NONE);
+								reviewDecision.setValue(R4EDecision.NONE);
 								modelReview.setDecision(reviewDecision);
 							}
 
@@ -1345,7 +1345,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 			//Fill the combo box selection
 			fDecisionUsersList.setEditableValues(participantsStr);
 
-			R4EReviewPhaseInfo phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.R4E_REVIEW_PHASE_STARTED);
+			R4EReviewPhaseInfo phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.STARTED);
 			final R4EReviewPhaseInfo currentPhaseInfo = modelFormalReview.getCurrent();
 			if (null != phaseInfo && null != phaseInfo.getPhaseOwnerID()) {
 				fPhasePlanning.setText(1, phaseInfo.getPhaseOwnerID());
@@ -1381,7 +1381,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 				fPhasePlanning.setText(3, "");
 			}
 
-			phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION);
+			phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.PREPARATION);
 			if (null != phaseInfo && null != phaseInfo.getPhaseOwnerID()) {
 				fPhasePreparation.setText(1, phaseInfo.getPhaseOwnerID());
 				fPhasePreparation.setText(2,
@@ -1414,7 +1414,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 				fPhasePreparation.setText(3, "");
 			}
 
-			phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.R4E_REVIEW_PHASE_DECISION);
+			phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.DECISION);
 			if (null != phaseInfo && null != phaseInfo.getPhaseOwnerID()) {
 				fPhaseDecision.setText(1, phaseInfo.getPhaseOwnerID());
 				fPhaseDecision.setText(2,
@@ -1448,7 +1448,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 				fPhaseDecision.setText(3, "");
 			}
 
-			phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.R4E_REVIEW_PHASE_REWORK);
+			phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.REWORK);
 			if (null != phaseInfo && null != phaseInfo.getPhaseOwnerID()) {
 				fPhaseRework.setText(1, phaseInfo.getPhaseOwnerID());
 				fPhaseRework.setText(2,
@@ -1482,7 +1482,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 				fPhaseRework.setText(3, "");
 			}
 
-			phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED);
+			phaseInfo = uiExtendedReview.getPhaseInfo(R4EReviewPhase.COMPLETED);
 			if (null != phaseInfo && null != phaseInfo.getType()) {
 				if (currentPhaseInfo.getType().equals(phaseInfo.getType())) {
 					fPhasePlanning.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GREEN));
@@ -1514,7 +1514,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 				|| fProperties.getElement().isReadOnly()
 				|| (!((R4EUIReviewBasic) fProperties.getElement()).isOpen())
 				|| ((R4EReviewState) ((R4EUIReviewBasic) fProperties.getElement()).getReview().getState()).getState()
-						.equals(R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED) || !fProperties.getElement().isEnabled()) {
+						.equals(R4EReviewPhase.COMPLETED) || !fProperties.getElement().isEnabled()) {
 			fNameText.setForeground(UIUtils.DISABLED_FONT_COLOR);
 			fPhaseCombo.setEnabled(false);
 			fDescriptionText.setForeground(UIUtils.DISABLED_FONT_COLOR);
@@ -1574,7 +1574,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 				fDecisionTimeSpentLabel.setVisible(false);
 				if (((R4EUIReviewBasic) fProperties.getElement()).getReview()
 						.getType()
-						.equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+						.equals(R4EReviewType.BASIC)) {
 					fDecisionSection.setVisible(false);
 				} else {
 					fDecisionSection.setVisible(true);
@@ -1657,7 +1657,7 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 				fReworkPhaseOwnerCombo.setVisible(false);
 				if (((R4EUIReviewBasic) fProperties.getElement()).getReview()
 						.getType()
-						.equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+						.equals(R4EReviewType.BASIC)) {
 					fDecisionSection.setVisible(false);
 				} else {
 					fDecisionSection.setVisible(true);
@@ -1673,35 +1673,35 @@ public class ReviewTabPropertySection extends ModelElementTabPropertySection imp
 		final R4EReviewPhase currentPhase = ((R4EFormalReview) ((R4EUIReviewExtended) fProperties.getElement()).getReview()).getCurrent()
 				.getType();
 		switch (currentPhase.getValue()) {
-		case R4EReviewPhase.R4E_REVIEW_PHASE_STARTED_VALUE:
+		case R4EReviewPhase.STARTED_VALUE:
 			fPlanningPhaseOwnerCombo.setVisible(true);
 			fPreparationPhaseOwnerCombo.setVisible(false);
 			fDecisionPhaseOwnerCombo.setVisible(false);
 			fReworkPhaseOwnerCombo.setVisible(false);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION_VALUE:
+		case R4EReviewPhase.PREPARATION_VALUE:
 			fPreparationPhaseOwnerCombo.setVisible(true);
 			fPlanningPhaseOwnerCombo.setVisible(false);
 			fDecisionPhaseOwnerCombo.setVisible(false);
 			fReworkPhaseOwnerCombo.setVisible(false);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_DECISION_VALUE:
+		case R4EReviewPhase.DECISION_VALUE:
 			fDecisionPhaseOwnerCombo.setVisible(true);
 			fPlanningPhaseOwnerCombo.setVisible(false);
 			fPreparationPhaseOwnerCombo.setVisible(false);
 			fReworkPhaseOwnerCombo.setVisible(false);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_REWORK_VALUE:
+		case R4EReviewPhase.REWORK_VALUE:
 			fReworkPhaseOwnerCombo.setVisible(true);
 			fPlanningPhaseOwnerCombo.setVisible(false);
 			fPreparationPhaseOwnerCombo.setVisible(false);
 			fDecisionPhaseOwnerCombo.setVisible(false);
 			break;
 
-		case R4EReviewPhase.R4E_REVIEW_PHASE_COMPLETED_VALUE:
+		case R4EReviewPhase.COMPLETED_VALUE:
 			fPlanningPhaseOwnerCombo.setVisible(false);
 			fPreparationPhaseOwnerCombo.setVisible(false);
 			fDecisionPhaseOwnerCombo.setVisible(false);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/RuleTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/RuleTabPropertySection.java
index 42f8fa7f..b77e6743 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/RuleTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/RuleTabPropertySection.java
@@ -273,8 +273,8 @@ public class RuleTabPropertySection extends ModelElementTabPropertySection {
 			fRankCombo.setItems(UIUtils.getRanks());
 			//Bug 368865:  Mapping needed for DEPRECATED value to MINOR
 			final int rankValue = modelRule.getRank().getValue();
-			fRankCombo.select(rankValue == R4EDesignRuleRank.R4E_RANK_DEPRECATED_VALUE
-					? R4EDesignRuleRank.R4E_RANK_MINOR_VALUE
+			fRankCombo.select(rankValue == R4EDesignRuleRank.DEPRECATED_VALUE
+					? R4EDesignRuleRank.MINOR_VALUE
 					: rankValue);
 
 			setEnabledFields();
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/sorters/ReviewTypeComparator.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/sorters/ReviewTypeComparator.java
index ab907181..94a189ae 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/sorters/ReviewTypeComparator.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/sorters/ReviewTypeComparator.java
@@ -44,14 +44,14 @@ public class ReviewTypeComparator extends NavigatorElementComparator {
 			return 1;
 		}
 		if (aElement instanceof R4EUIReviewBasic) {
-			if (((R4EUIReviewBasic) aElement).getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_BASIC)) {
+			if (((R4EUIReviewBasic) aElement).getReview().getType().equals(R4EReviewType.BASIC)) {
 				return 0;
 			} else if (((R4EUIReviewBasic) aElement).getReview()
 					.getType()
-					.equals(R4EReviewType.R4E_REVIEW_TYPE_INFORMAL)) {
+					.equals(R4EReviewType.INFORMAL)) {
 				return 1;
 			} else {
-				//Assume R4EReviewType.R4E_REVIEW_TYPE_FORMAL
+				//Assume R4EReviewType.FORMAL
 				return 2;
 			}
 		}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/CommandUtils.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/CommandUtils.java
index b3ebb773..311724d9 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/CommandUtils.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/CommandUtils.java
@@ -33,15 +33,13 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.ISourceRange;
 import org.eclipse.jdt.core.ISourceReference;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.mylyn.reviews.frame.core.model.Location;
-import org.eclipse.mylyn.reviews.frame.core.utils.Tracer;
+import org.eclipse.mylyn.reviews.core.model.ILocation;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomaly;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EAnomalyTextPosition;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EComment;
@@ -61,6 +59,7 @@ import org.eclipse.mylyn.reviews.r4e.core.rfs.spi.IRFSRegistry;
 import org.eclipse.mylyn.reviews.r4e.core.rfs.spi.RFSRegistryFactory;
 import org.eclipse.mylyn.reviews.r4e.core.rfs.spi.ReviewsFileStorageException;
 import org.eclipse.mylyn.reviews.r4e.core.utils.ResourceUtils;
+import org.eclipse.mylyn.reviews.r4e.core.utils.Tracer;
 import org.eclipse.mylyn.reviews.r4e.ui.R4EUIPlugin;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.editors.R4ECompareEditorInput;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.editors.R4EFileEditorInput;
@@ -602,16 +601,16 @@ public class CommandUtils {
 		R4EContextType dtype = null;
 		switch (aChangeType) {
 		case ADDED:
-			dtype = R4EContextType.R4E_ADDED;
+			dtype = R4EContextType.ADDED;
 			break;
 		case DELETED:
-			dtype = R4EContextType.R4E_DELETED;
+			dtype = R4EContextType.DELETED;
 			break;
 		case MODIFIED:
-			dtype = R4EContextType.R4E_MODIFIED;
+			dtype = R4EContextType.MODIFIED;
 			break;
 		case REPLACED:
-			dtype = R4EContextType.R4E_REPLACED;
+			dtype = R4EContextType.REPLACED;
 			break;
 		default:
 			break;
@@ -783,7 +782,7 @@ public class CommandUtils {
 	 */
 	public static R4EAnomalyTextPosition getAnomalyPosition(R4EAnomaly aAnomaly) {
 		if (null != aAnomaly) {
-			final EList<Location> location = aAnomaly.getLocation();
+			final List<ILocation> location = aAnomaly.getLocations();
 			if ((null != location) && (location.size() > 0)) {
 				final R4EContent content = (R4EContent) location.get(0); //look at first location only
 				if (null != content) {
@@ -804,7 +803,7 @@ public class CommandUtils {
 	 */
 	public static R4EFileVersion getAnomalyParentFile(R4EAnomaly aAnomaly) {
 		if (null != aAnomaly) {
-			final EList<Location> location = aAnomaly.getLocation();
+			final List<ILocation> location = aAnomaly.getLocations();
 			if ((null != location) && (location.size() > 0)) {
 				final R4EContent content = (R4EContent) location.get(0); //look at first location only
 				if (null != content) {
@@ -947,7 +946,7 @@ public class CommandUtils {
 						if (anomaly instanceof R4EAnomaly) {
 							Integer id = Integer.valueOf(origIdTokens[1]);
 							if (null != id) {
-								if (id.intValue() == anomaly.getId().getSequenceID()) {
+								if (id.intValue() == anomaly.getR4eId().getSequenceID()) {
 									return (R4EAnomaly) anomaly;
 								}
 							}
@@ -967,7 +966,7 @@ public class CommandUtils {
 	 * @return String
 	 */
 	public static String buildOriginalAnomalyID(R4EAnomaly aOrigAnomaly) {
-		return aOrigAnomaly.getId().getUserID() + R4EUIConstants.SEPARATOR + aOrigAnomaly.getId().getSequenceID();
+		return aOrigAnomaly.getR4eId().getUserID() + R4EUIConstants.SEPARATOR + aOrigAnomaly.getR4eId().getSequenceID();
 	}
 
 	/**
@@ -978,7 +977,7 @@ public class CommandUtils {
 	 * @return String
 	 */
 	public static String buildOriginalCommentID(R4EComment aOrigComment) {
-		return aOrigComment.getId().getUserID() + aOrigComment.getId().getSequenceID();
+		return aOrigComment.getR4eId().getUserID() + aOrigComment.getR4eId().getSequenceID();
 	}
 
 	/**
@@ -1000,7 +999,7 @@ public class CommandUtils {
 		if (null == participant) {
 			//Add the participant
 			final List<R4EUserRole> role = new ArrayList<R4EUserRole>(1);
-			role.add(R4EUserRole.R4E_ROLE_REVIEWER);
+			role.add(R4EUserRole.REVIEWER);
 			participant = R4EUIModelController.FModelExt.createR4EParticipant(aReview, aParticipantId, role);
 		}
 		return participant;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
index 5cc285d8..eddc9be7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
@@ -26,7 +26,6 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.ISourceReference;
 import org.eclipse.jface.dialogs.ErrorDialog;
@@ -421,13 +420,13 @@ public class MailServicesProxy {
 		final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
 		for (R4EParticipant participant : participants) {
 			if (isEmailValid(participant)) {
-				if (!(R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL))) {
+				if (!(R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.FORMAL))) {
 					destinations.add(participant.getEmail());
 				} else {
 					//If this is a formal review, only send mail if we have the proper role
-					if ((participant.getRoles().contains(R4EUserRole.R4E_ROLE_LEAD)
-							|| participant.getRoles().contains(R4EUserRole.R4E_ROLE_ORGANIZER) || participant.getRoles()
-							.contains(R4EUserRole.R4E_ROLE_AUTHOR))) {
+					if ((participant.getRoles().contains(R4EUserRole.LEAD)
+							|| participant.getRoles().contains(R4EUserRole.ORGANIZER) || participant.getRoles()
+							.contains(R4EUserRole.AUTHOR))) {
 						destinations.add(participant.getEmail());
 					}
 				}
@@ -446,13 +445,13 @@ public class MailServicesProxy {
 		final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
 		for (R4EParticipant participant : participants) {
 			if (isEmailValid(participant)) {
-				if (!(R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL))) {
+				if (!(R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.FORMAL))) {
 					destinations.add(participant.getEmail());
 				} else {
 					//If this is a formal review, only send mail if we have the proper role
-					if ((participant.getRoles().contains(R4EUserRole.R4E_ROLE_LEAD)
-							|| participant.getRoles().contains(R4EUserRole.R4E_ROLE_ORGANIZER) || participant.getRoles()
-							.contains(R4EUserRole.R4E_ROLE_AUTHOR))) {
+					if ((participant.getRoles().contains(R4EUserRole.LEAD)
+							|| participant.getRoles().contains(R4EUserRole.ORGANIZER) || participant.getRoles()
+							.contains(R4EUserRole.AUTHOR))) {
 						destinations.add(participant.getEmail());
 					}
 				}
@@ -471,8 +470,8 @@ public class MailServicesProxy {
 	/*  TODO not used for now, could be added later to narrow down destinations for anomaly questions
 	private static String[] createAnomalyCreatorDestination(R4EUIAnomalyBasic aAnomaly) {
 		final ArrayList<String> destinations = new ArrayList<String>();
-		if (!R4EUIModelController.getReviewer().equals(aAnomaly.getAnomaly().getUser().getId())) {
-			R4EParticipant participant = (R4EParticipant) aAnomaly.getAnomaly().getUser();
+		if (!R4EUIModelController.getReviewer().equals(aAnomaly.getAnomaly().getAuthor().getId())) {
+			R4EParticipant participant = (R4EParticipant) aAnomaly.getAnomaly().getAuthor();
 			if (isEmailValid(participant)) {
 				destinations.add(participant.getEmail());
 			}
@@ -570,7 +569,7 @@ public class MailServicesProxy {
 					msgBody.append("Review Item -> " + ((R4EItem) component).getDescription() + LINE_FEED_MSG_PART);
 				}
 				msgBody.append("Eclipse Project: File Path (Repository | Project)[: Line range]" + LINE_FEED_MSG_PART);
-				EList<R4EFileContext> contexts = ((R4EItem) component).getFileContextList();
+				List<R4EFileContext> contexts = ((R4EItem) component).getFileContextList();
 				for (R4EFileContext context : contexts) {
 					R4EFileVersion fileVersion = context.getTarget();
 					if (null != fileVersion) {
@@ -590,7 +589,7 @@ public class MailServicesProxy {
 						//Line Range
 						if (context.getDeltas().size() > 0) {
 							msgBody.append(": ");
-							EList<R4EDelta> deltas = context.getDeltas();
+							List<R4EDelta> deltas = context.getDeltas();
 							for (R4EDelta delta : deltas) {
 								msgBody.append(buildLineTag(delta) + ", ");
 							}
@@ -660,7 +659,7 @@ public class MailServicesProxy {
 				R4EUIAnomalyBasic[] anomalies = (R4EUIAnomalyBasic[]) context.getAnomalyContainerElement()
 						.getChildren();
 				for (R4EUIAnomalyBasic anomaly : anomalies) {
-					if (anomaly.getAnomaly().getUser().getId().equals(R4EUIModelController.getReviewer())) {
+					if (anomaly.getAnomaly().getAuthor().getId().equals(R4EUIModelController.getReviewer())) {
 						++numTotalAnomalies; //Specific anomalies
 					}
 				}
@@ -670,7 +669,7 @@ public class MailServicesProxy {
 				.getAnomalyContainer()
 				.getChildren();
 		for (R4EUIAnomalyBasic anomaly : globalAnomalies) {
-			if (anomaly.getAnomaly().getUser().getId().equals(R4EUIModelController.getReviewer())) {
+			if (anomaly.getAnomaly().getAuthor().getId().equals(R4EUIModelController.getReviewer())) {
 				++numTotalAnomalies; //Global Anomalies
 			}
 		}
@@ -730,7 +729,7 @@ public class MailServicesProxy {
 							msgBody.append(TAB_MSG_PART + "Anomaly: " + "Line Range: Title: Description"
 									+ LINE_FEED_MSG_PART);
 						}
-						if (anomaly.getAnomaly().getUser().getId().equals(R4EUIModelController.getReviewer())) {
+						if (anomaly.getAnomaly().getAuthor().getId().equals(R4EUIModelController.getReviewer())) {
 							//Add anomaly
 							msgBody.append(TAB_MSG_PART + TAB_MSG_PART + "   " + anomaly.getPosition().toString()
 									+ ": " + anomaly.getAnomaly().getTitle() + ": "
@@ -754,7 +753,7 @@ public class MailServicesProxy {
 			msgBody.append("Global Anomalies: " + LINE_FEED_MSG_PART);
 		}
 		for (R4EUIAnomalyBasic globalAnomaly : globalAnomalies) {
-			if (globalAnomaly.getAnomaly().getUser().getId().equals(R4EUIModelController.getReviewer())) {
+			if (globalAnomaly.getAnomaly().getAuthor().getId().equals(R4EUIModelController.getReviewer())) {
 				//Add anomaly
 				msgBody.append(globalAnomaly.getAnomaly().getTitle() + ": "
 						+ globalAnomaly.getAnomaly().getDescription() + LINE_FEED_MSG_PART);
@@ -1311,4 +1310,4 @@ public class MailServicesProxy {
 		}
 		return "";
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIConstants.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIConstants.java
index 32a5c6be..747874d0 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIConstants.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIConstants.java
@@ -4,7 +4,7 @@
  * 
  * 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
+ * accompanies this distribution, and is available at>
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Description:
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIMeetingData.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIMeetingData.java
index 74d12fc0..0a09c0f1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIMeetingData.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIMeetingData.java
@@ -14,7 +14,6 @@ package org.eclipse.mylyn.reviews.r4e.ui.internal.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.mylyn.reviews.notifications.core.IMeetingData;
 import org.eclipse.mylyn.reviews.r4e.core.model.R4EMeetingData;
 import org.eclipse.mylyn.reviews.r4e.core.model.serial.Persistence.ResourceUpdater;
@@ -290,7 +289,7 @@ public class R4EUIMeetingData implements IMeetingData {
 	 * @return String[]
 	 */
 	public String[] getReceivers() {
-		final EList<String> receiversRaw = fMeetingData.getReceivers();
+		final List<String> receiversRaw = fMeetingData.getReceivers();
 		List<String> receiversFiltered = new ArrayList<String>();
 		//Remove invalid entries
 		for (String entry : receiversRaw) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
index d160c8b7..c68a680c 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
@@ -35,7 +35,6 @@ import org.eclipse.compare.internal.MergeSourceViewer;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -642,17 +641,17 @@ public class UIUtils {
 	 */
 	public static R4EDesignRuleClass getClassFromString(String aClass) {
 		if (aClass.equals(R4EUIConstants.ANOMALY_CLASS_ERRONEOUS)) {
-			return R4EDesignRuleClass.R4E_CLASS_ERRONEOUS;
+			return R4EDesignRuleClass.ERRONEOUS;
 		} else if (aClass.equals(R4EUIConstants.ANOMALY_CLASS_SUPERFLUOUS)) {
-			return R4EDesignRuleClass.R4E_CLASS_SUPERFLUOUS;
+			return R4EDesignRuleClass.SUPERFLUOUS;
 		} else if (aClass.equals(R4EUIConstants.ANOMALY_CLASS_IMPROVEMENT)) {
-			return R4EDesignRuleClass.R4E_CLASS_IMPROVEMENT;
+			return R4EDesignRuleClass.IMPROVEMENT;
 		} else if (aClass.equals(R4EUIConstants.ANOMALY_CLASS_COMMENT)) {
-			return R4EDesignRuleClass.R4E_CLASS_COMMENT;
+			return R4EDesignRuleClass.COMMENT;
 		} else if (aClass.equals(R4EUIConstants.ANOMALY_CLASS_QUESTION)) {
-			return R4EDesignRuleClass.R4E_CLASS_QUESTION;
+			return R4EDesignRuleClass.QUESTION;
 		} else if (aClass.equals(R4EUIConstants.ANOMALY_CLASS_MISSSING)) {
-			return R4EDesignRuleClass.R4E_CLASS_MISSING;
+			return R4EDesignRuleClass.MISSING;
 		} else {
 			return null; //should never happen
 		}
@@ -666,17 +665,17 @@ public class UIUtils {
 	 * @return String
 	 */
 	public static String getClassStr(R4EDesignRuleClass aClass) {
-		if (aClass.equals(R4EDesignRuleClass.R4E_CLASS_ERRONEOUS)) {
+		if (aClass.equals(R4EDesignRuleClass.ERRONEOUS)) {
 			return R4EUIConstants.ANOMALY_CLASS_ERRONEOUS;
-		} else if (aClass.equals(R4EDesignRuleClass.R4E_CLASS_SUPERFLUOUS)) {
+		} else if (aClass.equals(R4EDesignRuleClass.SUPERFLUOUS)) {
 			return R4EUIConstants.ANOMALY_CLASS_SUPERFLUOUS;
-		} else if (aClass.equals(R4EDesignRuleClass.R4E_CLASS_IMPROVEMENT)) {
+		} else if (aClass.equals(R4EDesignRuleClass.IMPROVEMENT)) {
 			return R4EUIConstants.ANOMALY_CLASS_IMPROVEMENT;
-		} else if (aClass.equals(R4EDesignRuleClass.R4E_CLASS_QUESTION)) {
+		} else if (aClass.equals(R4EDesignRuleClass.QUESTION)) {
 			return R4EUIConstants.ANOMALY_CLASS_QUESTION;
-		} else if (aClass.equals(R4EDesignRuleClass.R4E_CLASS_COMMENT)) {
+		} else if (aClass.equals(R4EDesignRuleClass.COMMENT)) {
 			return R4EUIConstants.ANOMALY_CLASS_COMMENT;
-		} else if (aClass.equals(R4EDesignRuleClass.R4E_CLASS_MISSING)) {
+		} else if (aClass.equals(R4EDesignRuleClass.MISSING)) {
 			return R4EUIConstants.ANOMALY_CLASS_MISSSING;
 		} else {
 			return null; //should never happen
@@ -692,11 +691,11 @@ public class UIUtils {
 	 */
 	public static R4EDesignRuleRank getRankFromString(String aRank) {
 		if (aRank.equals(R4EUIConstants.ANOMALY_RANK_NONE)) {
-			return R4EDesignRuleRank.R4E_RANK_NONE;
+			return R4EDesignRuleRank.NONE;
 		} else if (aRank.equals(R4EUIConstants.ANOMALY_RANK_MINOR)) {
-			return R4EDesignRuleRank.R4E_RANK_MINOR;
+			return R4EDesignRuleRank.MINOR;
 		} else if (aRank.equals(R4EUIConstants.ANOMALY_RANK_MAJOR)) {
-			return R4EDesignRuleRank.R4E_RANK_MAJOR;
+			return R4EDesignRuleRank.MAJOR;
 		} else {
 			return null; //should never happen
 		}
@@ -710,13 +709,13 @@ public class UIUtils {
 	 * @return String
 	 */
 	public static String getRankStr(R4EDesignRuleRank aRank) {
-		if (aRank.equals(R4EDesignRuleRank.R4E_RANK_NONE)) {
+		if (aRank.equals(R4EDesignRuleRank.NONE)) {
 			return R4EUIConstants.ANOMALY_RANK_NONE;
-		} else if (aRank.equals(R4EDesignRuleRank.R4E_RANK_MINOR)) {
+		} else if (aRank.equals(R4EDesignRuleRank.MINOR)) {
 			return R4EUIConstants.ANOMALY_RANK_MINOR;
-		} else if (aRank.equals(R4EDesignRuleRank.R4E_RANK_MAJOR)) {
+		} else if (aRank.equals(R4EDesignRuleRank.MAJOR)) {
 			return R4EUIConstants.ANOMALY_RANK_MAJOR;
-		} else if (aRank.equals(R4EDesignRuleRank.R4E_RANK_DEPRECATED)) {
+		} else if (aRank.equals(R4EDesignRuleRank.DEPRECATED)) {
 			return R4EUIConstants.ANOMALY_RANK_MINOR;
 		} else {
 			return null; //should never happen
@@ -928,7 +927,7 @@ public class UIUtils {
 			try {
 				if (aReview instanceof R4EUIReviewExtended) {
 					final R4EFormalReview review = ((R4EFormalReview) ((R4EUIReviewExtended) aReview).getReview());
-					if (aNewPhase.equals(R4EReviewPhase.R4E_REVIEW_PHASE_PREPARATION)
+					if (aNewPhase.equals(R4EReviewPhase.PREPARATION)
 							&& null == review.getActiveMeeting()) {
 						Display.getDefault().syncExec(new Runnable() {
 							public void run() {
@@ -1027,10 +1026,10 @@ public class UIUtils {
 	 * Method formatAssignedParticipants. Concatenates assigned participants for UI display
 	 * 
 	 * @param aParticipants
-	 *            EList<String>
+	 *            List<String>
 	 * @return String
 	 */
-	public static String formatAssignedParticipants(EList<String> aParticipants) {
+	public static String formatAssignedParticipants(List<String> aParticipants) {
 		if (aParticipants.size() > 0) {
 			final StringBuffer buffer = new StringBuffer();
 			for (String participants : aParticipants) {
diff --git a/pom.xml b/pom.xml
index 65ceeda7..651434dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,22 @@
           <layout>p2</layout>
           <url>${mylyn-versions-repository-url}</url>
         </repository>
-<!--  Orbit is taken from parent pom
+		<repository>
+			<id>eclipse-mylyn-tasks</id>
+			<layout>p2</layout>
+			<url>${mylyn-tasks-repository-url}</url>
+		</repository>
+		<repository>
+			<id>eclipse-mylyn-context</id>
+			<layout>p2</layout>
+			<url>${mylyn-context-repository-url}</url>
+		</repository>
+        <repository>
+          <id>eclipse-mylyn-reviews</id>
+          <layout>p2</layout>
+          <url>${mylyn-reviews-repository-url}</url>
+        </repository>
+		<!--  Orbit is taken from parent pom
         <repository>
            <id>eclipse-mylyn-orbit-committers</id>
            <layout>p2</layout>
@@ -157,7 +172,6 @@
   </dependencyManagement>
 
   <modules>
-     <module>org.eclipse.mylyn.reviews.frame.core</module>
      <module>org.eclipse.mylyn.reviews.frame.ui</module>
      <module>org.eclipse.mylyn.reviews.r4e.ldap</module>
      <module>org.eclipse.mylyn.reviews.notifications</module>