diff --git a/changelog.md b/changelog.md
index 479b4c8..c5eeaf0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2025-01-23 - 2.1.8 - fix(core)
+Refactor and clean up class imports and exports
+
+- Simplified class file structure by unifying imports and exports.
+- Removed redundant `logcontext.*` prefixes from filenames.
+- Ensured consistent path references in index.ts.
+
 ## 2025-01-23 - 2.1.7 - fix(core)
 Enhanced debugging and improved dependency tracking
 
diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts
index 42c8c99..48495b2 100644
--- a/ts/00_commitinfo_data.ts
+++ b/ts/00_commitinfo_data.ts
@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartcontext',
-  version: '2.1.7',
+  version: '2.1.8',
   description: 'A module providing advanced asynchronous context management to enrich logs with context and manage scope effectively in Node.js applications.'
 }
diff --git a/ts/logcontext.classes.asynccontext.ts b/ts/classes.asynccontext.ts
similarity index 79%
rename from ts/logcontext.classes.asynccontext.ts
rename to ts/classes.asynccontext.ts
index 01a0249..d48d2bf 100644
--- a/ts/logcontext.classes.asynccontext.ts
+++ b/ts/classes.asynccontext.ts
@@ -1,5 +1,5 @@
-import * as plugins from './logcontext.plugins.js';
-import { AsyncStore } from './logcontext.classes.asyncstore.js';
+import * as plugins from './plugins.js';
+import { AsyncStore } from './classes.asyncstore.js';
 
 export class AsyncContext {
   private _context = new plugins.simpleAsyncContext.AsyncContext.Variable<AsyncStore>();
diff --git a/ts/logcontext.classes.asyncstore.ts b/ts/classes.asyncstore.ts
similarity index 98%
rename from ts/logcontext.classes.asyncstore.ts
rename to ts/classes.asyncstore.ts
index f183205..320bfda 100644
--- a/ts/logcontext.classes.asyncstore.ts
+++ b/ts/classes.asyncstore.ts
@@ -1,4 +1,4 @@
-import * as plugins from './logcontext.plugins.js';
+import * as plugins from './plugins.js';
 
 export class AsyncStore {
   private static idCounter = 0;
diff --git a/ts/index.ts b/ts/index.ts
index 2542a46..81696bf 100644
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -1,2 +1,2 @@
-export * from './logcontext.classes.asynccontext.js';
-export * from './logcontext.classes.asyncstore.js';
\ No newline at end of file
+export * from './classes.asynccontext.js';
+export * from './classes.asyncstore.js';
\ No newline at end of file
diff --git a/ts/logcontext.plugins.ts b/ts/plugins.ts
similarity index 100%
rename from ts/logcontext.plugins.ts
rename to ts/plugins.ts