diff --git a/src/models/activity/Activity.model.ts b/src/models/activity/Activity.model.ts
index e2e5c8b..fad669b 100644
--- a/src/models/activity/Activity.model.ts
+++ b/src/models/activity/Activity.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import { ActivityFields } from "./Activity.types";
 import {ASModelType} from "../../common/common.types";
 
diff --git a/src/models/application/Application.model.ts b/src/models/application/Application.model.ts
index 3721d25..5e7d208 100644
--- a/src/models/application/Application.model.ts
+++ b/src/models/application/Application.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {ApplicationFields} from "./Application.types";
 
diff --git a/src/models/article/Article.model.ts b/src/models/article/Article.model.ts
index cefcef3..629627d 100644
--- a/src/models/article/Article.model.ts
+++ b/src/models/article/Article.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {ArticleFields} from "./Article.types";
 
diff --git a/src/models/ASBase.model.ts b/src/models/asBase/ASBase.model.ts
similarity index 95%
rename from src/models/ASBase.model.ts
rename to src/models/asBase/ASBase.model.ts
index d7cb0f5..60d6dcb 100644
--- a/src/models/ASBase.model.ts
+++ b/src/models/asBase/ASBase.model.ts
@@ -1,4 +1,4 @@
-import { contexts } from "../common/common.constants";
+import { contexts } from "../../common/common.constants";
 
 // TODO: types
 // TODO: renaming/refactor
diff --git a/src/models/asEvent/ASEvent.model.ts b/src/models/asEvent/ASEvent.model.ts
index ec6b66f..1480f09 100644
--- a/src/models/asEvent/ASEvent.model.ts
+++ b/src/models/asEvent/ASEvent.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {ASEventFields} from "./ASEvent.types";
 
diff --git a/src/models/asObject/ASObject.model.ts b/src/models/asObject/ASObject.model.ts
index d26a657..a3e6e31 100644
--- a/src/models/asObject/ASObject.model.ts
+++ b/src/models/asObject/ASObject.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import { ASObjectFields } from "./ASObject.types";
 import {ASModelType} from "../../common/common.types";
 
diff --git a/src/models/audio/Audio.model.ts b/src/models/audio/Audio.model.ts
index 3f49506..ad5e92c 100644
--- a/src/models/audio/Audio.model.ts
+++ b/src/models/audio/Audio.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {AudioFields} from "./Audio.types";
 
diff --git a/src/models/document/Document.model.ts b/src/models/document/Document.model.ts
index 0939f0b..cfdd6b5 100644
--- a/src/models/document/Document.model.ts
+++ b/src/models/document/Document.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {DocumentFields} from "./Document.types";
 
diff --git a/src/models/group/Group.model.ts b/src/models/group/Group.model.ts
index b1f0602..7269e4c 100644
--- a/src/models/group/Group.model.ts
+++ b/src/models/group/Group.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {GroupFields} from "./Group.types";
 
diff --git a/src/models/image/Image.model.ts b/src/models/image/Image.model.ts
index 249a0b1..c740e48 100644
--- a/src/models/image/Image.model.ts
+++ b/src/models/image/Image.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {ImageFields} from "./Image.types";
 
diff --git a/src/models/intransitiveActivity/IntransitiveActivity.model.ts b/src/models/intransitiveActivity/IntransitiveActivity.model.ts
index 0688a8d..98ee428 100644
--- a/src/models/intransitiveActivity/IntransitiveActivity.model.ts
+++ b/src/models/intransitiveActivity/IntransitiveActivity.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {IntransitiveActivityFields} from './IntransitiveActivity.types';
 import {ASModelType} from "../../common/common.types";
 
diff --git a/src/models/link/Link.model.ts b/src/models/link/Link.model.ts
index 5995dd1..c6a982a 100644
--- a/src/models/link/Link.model.ts
+++ b/src/models/link/Link.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import { LinkFields } from "./Link.types";
 import {ASModelType} from "../../common/common.types";
 
diff --git a/src/models/note/Note.model.ts b/src/models/note/Note.model.ts
index a1fd475..b25ba62 100644
--- a/src/models/note/Note.model.ts
+++ b/src/models/note/Note.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {NoteFields} from "./Note.types";
 
diff --git a/src/models/organization/Organization.model.ts b/src/models/organization/Organization.model.ts
index b454862..5d00ecc 100644
--- a/src/models/organization/Organization.model.ts
+++ b/src/models/organization/Organization.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {OrganizationFields} from "./Organization.types";
 
diff --git a/src/models/page/Page.model.ts b/src/models/page/Page.model.ts
index 8926f30..b322268 100644
--- a/src/models/page/Page.model.ts
+++ b/src/models/page/Page.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {PageFields} from "./Page.types";
 
diff --git a/src/models/person/Person.model.ts b/src/models/person/Person.model.ts
index 0781df4..6671943 100644
--- a/src/models/person/Person.model.ts
+++ b/src/models/person/Person.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {PersonFields} from "./Person.types";
 
diff --git a/src/models/place/Place.model.ts b/src/models/place/Place.model.ts
index 104bea0..b5420c6 100644
--- a/src/models/place/Place.model.ts
+++ b/src/models/place/Place.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {PlaceFields} from "./Place.types";
 
diff --git a/src/models/profile/Profile.model.ts b/src/models/profile/Profile.model.ts
index 8ed4159..9dbd4f9 100644
--- a/src/models/profile/Profile.model.ts
+++ b/src/models/profile/Profile.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {ProfileFields} from "./Profile.types";
 
diff --git a/src/models/question/Question.model.ts b/src/models/question/Question.model.ts
index 2b721f3..289d02a 100644
--- a/src/models/question/Question.model.ts
+++ b/src/models/question/Question.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {QuestionFields} from "./Question.types";
 
diff --git a/src/models/relationship/Relationship.model.ts b/src/models/relationship/Relationship.model.ts
index 9ff8031..b492330 100644
--- a/src/models/relationship/Relationship.model.ts
+++ b/src/models/relationship/Relationship.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {RelationshipFields} from "./Relationship.types";
 
diff --git a/src/models/service/Service.model.ts b/src/models/service/Service.model.ts
index 52147a8..b653bdf 100644
--- a/src/models/service/Service.model.ts
+++ b/src/models/service/Service.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {ServiceFields} from "./Service.types";
 
diff --git a/src/models/tombstone/Tombstone.model.ts b/src/models/tombstone/Tombstone.model.ts
index d9b8f5c..bd05025 100644
--- a/src/models/tombstone/Tombstone.model.ts
+++ b/src/models/tombstone/Tombstone.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {TombstoneFields} from "./Tombstone.types";
 
diff --git a/src/models/video/Video.model.ts b/src/models/video/Video.model.ts
index 528e103..ee61b45 100644
--- a/src/models/video/Video.model.ts
+++ b/src/models/video/Video.model.ts
@@ -1,4 +1,4 @@
-import {ASBase} from "../ASBase.model";
+import {ASBase} from "../asBase/ASBase.model";
 import {ASModelType} from "../../common/common.types";
 import {VideoFields} from "./Video.types";