diff --git a/portal-2/src/app/claimPages/linking/claimContext/claimContext.component.ts b/portal-2/src/app/claimPages/claim-utils/claimContext.component.ts
similarity index 99%
rename from portal-2/src/app/claimPages/linking/claimContext/claimContext.component.ts
rename to portal-2/src/app/claimPages/claim-utils/claimContext.component.ts
index ecbb3e9a..099ed71e 100644
--- a/portal-2/src/app/claimPages/linking/claimContext/claimContext.component.ts
+++ b/portal-2/src/app/claimPages/claim-utils/claimContext.component.ts
@@ -1,6 +1,6 @@
 import {Component, Input,Output, ElementRef, EventEmitter} from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
-import {ContextsService} from '../../../services/contexts.service';
+import {ContextsService} from '../../services/contexts.service';
 
 
 @Component({
diff --git a/portal-2/src/app/claimPages/linking/claimResult/claimDataset/claimDataset.component.ts b/portal-2/src/app/claimPages/claim-utils/claimDataset.component.ts
similarity index 98%
rename from portal-2/src/app/claimPages/linking/claimResult/claimDataset/claimDataset.component.ts
rename to portal-2/src/app/claimPages/claim-utils/claimDataset.component.ts
index 0c3073e0..5e06eada 100644
--- a/portal-2/src/app/claimPages/linking/claimResult/claimDataset/claimDataset.component.ts
+++ b/portal-2/src/app/claimPages/claim-utils/claimDataset.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, Output, EventEmitter} from '@angular/core';
 import { Observable }       from 'rxjs/Observable';
-import { SearchDataciteService } from '../../../../services/searchDatacite.service';
+import { SearchDataciteService } from '../../services/searchDatacite.service';
 
 
 @Component({
diff --git a/portal-2/src/app/claimPages/linking/claimProject/claimProject.component.ts b/portal-2/src/app/claimPages/claim-utils/claimProject.component.ts
similarity index 97%
rename from portal-2/src/app/claimPages/linking/claimProject/claimProject.component.ts
rename to portal-2/src/app/claimPages/claim-utils/claimProject.component.ts
index 47f6240e..d1153420 100644
--- a/portal-2/src/app/claimPages/linking/claimProject/claimProject.component.ts
+++ b/portal-2/src/app/claimPages/claim-utils/claimProject.component.ts
@@ -1,8 +1,8 @@
 import {Component, Input,Output, ElementRef, EventEmitter, ViewChild} from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
-import {OpenaireProjectsService} from '../../../services/openaireProjects.service';
-import {ProjectService} from '../../../services/project.service';
-import {ModalLoading} from '../../../utils/modal/loading.component';
+import {OpenaireProjectsService} from '../../services/openaireProjects.service';
+import {ProjectService} from '../../services/project.service';
+import {ModalLoading} from '../../utils/modal/loading.component';
 import { Subject } from 'rxjs/Subject';
 
 
diff --git a/portal-2/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.html b/portal-2/src/app/claimPages/claim-utils/claimPublication.component.html
similarity index 99%
rename from portal-2/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.html
rename to portal-2/src/app/claimPages/claim-utils/claimPublication.component.html
index 1e63e7c6..ec7fa2bb 100644
--- a/portal-2/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.html
+++ b/portal-2/src/app/claimPages/claim-utils/claimPublication.component.html
@@ -74,3 +74,5 @@
      </div>
   </div>
 </div>
+
+
diff --git a/portal-2/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.ts b/portal-2/src/app/claimPages/claim-utils/claimPublication.component.ts
similarity index 98%
rename from portal-2/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.ts
rename to portal-2/src/app/claimPages/claim-utils/claimPublication.component.ts
index 1a232851..74c3dac0 100644
--- a/portal-2/src/app/claimPages/linking/claimResult/claimPublication/claimPublication.component.ts
+++ b/portal-2/src/app/claimPages/claim-utils/claimPublication.component.ts
@@ -1,8 +1,8 @@
 import {Component, Input, Output, EventEmitter} from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
 import { ActivatedRoute } from '@angular/router';
-import {SearchCrossrefService} from '../../../../services/searchCrossref.service';
-import {SearchOrcidService} from '../../../../services/searchOrcid.service';
+import {SearchCrossrefService} from '../../services/searchCrossref.service';
+import {SearchOrcidService} from '../../services/searchOrcid.service';
 
 
 @Component({
diff --git a/portal-2/src/app/claimPages/linking/claimResult/claimResult.component.ts b/portal-2/src/app/claimPages/claim-utils/claimResult.component.ts
similarity index 94%
rename from portal-2/src/app/claimPages/linking/claimResult/claimResult.component.ts
rename to portal-2/src/app/claimPages/claim-utils/claimResult.component.ts
index 0125aaf8..210ba146 100644
--- a/portal-2/src/app/claimPages/linking/claimResult/claimResult.component.ts
+++ b/portal-2/src/app/claimPages/claim-utils/claimResult.component.ts
@@ -1,8 +1,8 @@
 import {Component, Input, Output, EventEmitter, ViewChild} from '@angular/core';
 import {Observable}       from 'rxjs/Observable';
-import {ClaimPublicationComponent} from './claimPublication/claimPublication.component';
-import {ClaimDatasetComponent} from './claimDataset/claimDataset.component';
-import {SearchDataciteService} from '../../../services/searchDatacite.service';
+import {ClaimPublicationComponent} from './claimPublication.component';
+import {ClaimDatasetComponent} from './claimDataset.component';
+import {SearchDataciteService} from '../../services/searchDatacite.service';
 
 @Component({
     selector: 'claim-result',
diff --git a/portal-2/src/app/claimPages/claims/claims.component.html b/portal-2/src/app/claimPages/claim-utils/claims.component.html
similarity index 100%
rename from portal-2/src/app/claimPages/claims/claims.component.html
rename to portal-2/src/app/claimPages/claim-utils/claims.component.html
diff --git a/portal-2/src/app/claimPages/claims/claims.component.ts b/portal-2/src/app/claimPages/claim-utils/claims.component.ts
similarity index 100%
rename from portal-2/src/app/claimPages/claims/claims.component.ts
rename to portal-2/src/app/claimPages/claim-utils/claims.component.ts
diff --git a/portal-2/src/app/claimPages/claim.module.ts b/portal-2/src/app/claimPages/claim.module.ts
index 3a38cb56..46c116b9 100644
--- a/portal-2/src/app/claimPages/claim.module.ts
+++ b/portal-2/src/app/claimPages/claim.module.ts
@@ -15,13 +15,13 @@ import {LinkingComponent} from './linking/linking.component';
 import { BulkLinkingComponent } from './linking/bulkLinking.component';
 
 import {BulkClaimComponent} from './linking/bulkClaim/bulkClaim.component';
-import {ClaimsComponent} from './claims/claims.component';
+import {ClaimsComponent} from './claim-utils/claims.component';
 
-import {ClaimContextComponent} from './linking/claimContext/claimContext.component';
-import {ClaimProjectsComponent} from './linking/claimProject/claimProject.component';
-import {ClaimResultComponent} from './linking/claimResult/claimResult.component';
-import {ClaimPublicationComponent} from './linking/claimResult/claimPublication/claimPublication.component';
-import {ClaimDatasetComponent} from './linking/claimResult/claimDataset/claimDataset.component';
+import {ClaimContextComponent} from './claim-utils/claimContext.component';
+import {ClaimProjectsComponent} from './claim-utils/claimProject.component';
+import {ClaimResultComponent} from './claim-utils/claimResult.component';
+import {ClaimPublicationComponent} from './claim-utils/claimPublication.component';
+import {ClaimDatasetComponent} from './claim-utils/claimDataset.component';
 
 import {ClaimInsertComponent} from './linking/insertClaim/insertClaim.component';
 
@@ -34,9 +34,9 @@ import {ClaimSelectedPublicationsComponent} from './linking/selected/selectedPub
 
 import {LinkingGenericComponent} from './linking/linkingGeneric.component';
 
-import {InlineClaimContextComponent} from './inlineClaimContext/inlineClaimContext.component';
-import {InlineClaimProjectComponent} from './inlineClaimProject/inlineClaimProject.component';
-import {InlineClaimResultComponent} from './inlineClaimResult/inlineClaimResult.component';
+import {InlineClaimContextComponent} from './inlineClaims/inlineClaimContext.component';
+import {InlineClaimProjectComponent} from './inlineClaims/inlineClaimProject.component';
+import {InlineClaimResultComponent} from './inlineClaims/inlineClaimResult.component';
  import {ClaimEntityFormatter} from '../utils/claimEntityFormatter.component';
 import { Claim } from '../utils/entities/claim';
 
diff --git a/portal-2/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts b/portal-2/src/app/claimPages/inlineClaims/inlineClaimContext.component.ts
similarity index 100%
rename from portal-2/src/app/claimPages/inlineClaimContext/inlineClaimContext.component.ts
rename to portal-2/src/app/claimPages/inlineClaims/inlineClaimContext.component.ts
diff --git a/portal-2/src/app/claimPages/inlineClaimProject/inlineClaimProject.component.ts b/portal-2/src/app/claimPages/inlineClaims/inlineClaimProject.component.ts
similarity index 100%
rename from portal-2/src/app/claimPages/inlineClaimProject/inlineClaimProject.component.ts
rename to portal-2/src/app/claimPages/inlineClaims/inlineClaimProject.component.ts
diff --git a/portal-2/src/app/claimPages/inlineClaimResult/inlineClaimResult.component.ts b/portal-2/src/app/claimPages/inlineClaims/inlineClaimResult.component.ts
similarity index 100%
rename from portal-2/src/app/claimPages/inlineClaimResult/inlineClaimResult.component.ts
rename to portal-2/src/app/claimPages/inlineClaims/inlineClaimResult.component.ts
diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.ts b/portal-2/src/app/landingPages/dataset/dataset.component.ts
index f5edeac2..d8fdcd82 100644
--- a/portal-2/src/app/landingPages/dataset/dataset.component.ts
+++ b/portal-2/src/app/landingPages/dataset/dataset.component.ts
@@ -4,9 +4,9 @@ import {DatasetService} from '../../services/dataset.service';
 import {DatasetInfo} from '../../utils/entities/datasetInfo';
 import {ActivatedRoute} from '@angular/router';
 import { OpenaireProperties} from '../../utils/properties/openaireProperties'
-import {InlineClaimContextComponent} from '../../claimPages/inlineClaimContext/inlineClaimContext.component';
-import {InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/inlineClaimProject.component';
-import {InlineClaimResultComponent} from '../../claimPages/inlineClaimResult/inlineClaimResult.component';
+import {InlineClaimContextComponent} from '../../claimPages/inlineClaims/inlineClaimContext.component';
+import {InlineClaimProjectComponent} from '../../claimPages/inlineClaims/inlineClaimProject.component';
+import {InlineClaimResultComponent} from '../../claimPages/inlineClaims/inlineClaimResult.component';
 @Component({
     selector: 'dataset',
     templateUrl: 'dataset.component.html',
diff --git a/portal-2/src/app/landingPages/project/project.component.ts b/portal-2/src/app/landingPages/project/project.component.ts
index 2da53ee0..99991bb1 100644
--- a/portal-2/src/app/landingPages/project/project.component.ts
+++ b/portal-2/src/app/landingPages/project/project.component.ts
@@ -3,7 +3,7 @@ import {Observable} from 'rxjs/Observable';
 import {ActivatedRoute, Params} from '@angular/router';
 import {ProjectService} from '../../services/project.service';
 import {ProjectInfo} from '../../utils/entities/projectInfo';
-import {InlineClaimResultComponent} from '../../claimPages/inlineClaimResult/inlineClaimResult.component';
+import {InlineClaimResultComponent} from '../../claimPages/inlineClaims/inlineClaimResult.component';
 
 @Component({
     selector: 'project',
diff --git a/portal-2/src/app/landingPages/publication/publication.component.ts b/portal-2/src/app/landingPages/publication/publication.component.ts
index 1c8f1b74..c135c83a 100644
--- a/portal-2/src/app/landingPages/publication/publication.component.ts
+++ b/portal-2/src/app/landingPages/publication/publication.component.ts
@@ -4,9 +4,9 @@ import {PublicationService} from '../../services/publication.service';
 import {PublicationInfo} from '../../utils/entities/publicationInfo';
 import {ActivatedRoute} from '@angular/router';
 import {OpenaireProperties} from '../../utils/properties/openaireProperties';
-import {InlineClaimContextComponent} from '../../claimPages/inlineClaimContext/inlineClaimContext.component';
-import {InlineClaimProjectComponent} from '../../claimPages/inlineClaimProject/inlineClaimProject.component';
-import {InlineClaimResultComponent} from '../../claimPages/inlineClaimResult/inlineClaimResult.component';
+import {InlineClaimContextComponent} from '../../claimPages/inlineClaims/inlineClaimContext.component';
+import {InlineClaimProjectComponent} from '../../claimPages/inlineClaims/inlineClaimProject.component';
+import {InlineClaimResultComponent} from '../../claimPages/inlineClaims/inlineClaimResult.component';
 @Component({
     selector: 'publication',
     templateUrl: 'publication.component.html',