diff --git a/npm/ng-packs/packages/schematics/src/commands/api/files-enum/proxy/enums/__namespace@dir__/__name@kebab__.ts.template b/npm/ng-packs/packages/schematics/src/commands/api/files-enum/proxy/__namespace@dir__/__name@kebab__.enum.ts.template
similarity index 100%
rename from npm/ng-packs/packages/schematics/src/commands/api/files-enum/proxy/enums/__namespace@dir__/__name@kebab__.ts.template
rename to npm/ng-packs/packages/schematics/src/commands/api/files-enum/proxy/__namespace@dir__/__name@kebab__.enum.ts.template
diff --git a/npm/ng-packs/packages/schematics/src/commands/api/files-model/proxy/models/__namespace@dir__/model.ts.template b/npm/ng-packs/packages/schematics/src/commands/api/files-model/proxy/__namespace@dir__/models.ts.template
similarity index 100%
rename from npm/ng-packs/packages/schematics/src/commands/api/files-model/proxy/models/__namespace@dir__/model.ts.template
rename to npm/ng-packs/packages/schematics/src/commands/api/files-model/proxy/__namespace@dir__/models.ts.template
diff --git a/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/services/__namespace@dir__/__name@kebab__.service.ts.template b/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template
similarity index 100%
rename from npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/services/__namespace@dir__/__name@kebab__.service.ts.template
rename to npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template
diff --git a/npm/ng-packs/packages/schematics/src/utils/barrel.ts b/npm/ng-packs/packages/schematics/src/utils/barrel.ts
index 299876f875..b21acc77fa 100644
--- a/npm/ng-packs/packages/schematics/src/utils/barrel.ts
+++ b/npm/ng-packs/packages/schematics/src/utils/barrel.ts
@@ -18,13 +18,12 @@ export function generateBarrelFromPath(tree: Tree, indexPath: string) {
   const saveFile = createFileSaver(tree);
   const dir = tree.getDir(indexPath);
 
-  let _exports = '';
+  const _exports: string[] = [];
 
   dir.subfiles.forEach(fragment => {
     if (!fragment.endsWith('.ts')) return;
 
-    _exports += `export * from './${fragment.replace(/\.ts$/, '')}';
-`;
+    _exports.push(`export * from './${fragment.replace(/\.ts$/, '')}';`);
   });
 
   dir.subdirs.forEach(fragment => {
@@ -34,10 +33,16 @@ export function generateBarrelFromPath(tree: Tree, indexPath: string) {
     subDir.visit(() => (hasFiles = true));
     if (!hasFiles) return;
 
-    _exports += `export * as ${strings.classify(fragment)} from './${fragment}';
-`;
+    _exports.push(`export * as ${strings.classify(fragment)} from './${fragment}';`);
     generateBarrelFromPath(tree, subDirPath);
   });
 
-  if (_exports) saveFile(indexPath + '/index.ts', _exports);
+  _exports.sort();
+
+  if (_exports.length)
+    saveFile(
+      indexPath + '/index.ts',
+      _exports.join(`
+`),
+    );
 }
diff --git a/npm/ng-packs/packages/schematics/src/utils/enum.ts b/npm/ng-packs/packages/schematics/src/utils/enum.ts
index 818a1a089b..c01b086ec5 100644
--- a/npm/ng-packs/packages/schematics/src/utils/enum.ts
+++ b/npm/ng-packs/packages/schematics/src/utils/enum.ts
@@ -13,7 +13,7 @@ export interface EnumGeneratorParams {
 }
 
 export function isEnumImport(path: string) {
-  return path.includes('/enums/');
+  return path.endsWith('.enum');
 }
 
 export function getEnumNamesFromImports(serviceImports: Record<string, string[]>) {
diff --git a/npm/ng-packs/packages/schematics/src/utils/path.ts b/npm/ng-packs/packages/schematics/src/utils/path.ts
index cb1d499755..7ae89d19bc 100644
--- a/npm/ng-packs/packages/schematics/src/utils/path.ts
+++ b/npm/ng-packs/packages/schematics/src/utils/path.ts
@@ -1,15 +1,33 @@
-import { dir, kebab } from './text';
+import { strings } from '@angular-devkit/core';
+import { kebab } from './text';
 
 export function relativePathToEnum(namespace: string, enumNamespace: string, enumName: string) {
-  const repeats = namespace ? namespace.split('.').length : 0;
-  const path = '..' + '/..'.repeat(repeats) + '/enums/' + dir(enumNamespace);
-  return removeDoubleSlash(path + '/' + kebab(enumName));
+  const path = calculateRelativePath(namespace, enumNamespace);
+  return removeDoubleSlash(path + `/${kebab(enumName)}.enum`);
 }
 
 export function relativePathToModel(namespace: string, modelNamespace: string) {
-  const repeats = namespace ? namespace.split('.').length : 0;
-  const path = '..' + '/..'.repeat(repeats) + '/models/' + dir(modelNamespace);
-  return removeTrailingSlash(path);
+  const path = calculateRelativePath(namespace, modelNamespace);
+  return removeTrailingSlash(path + '/models');
+}
+
+function calculateRelativePath(ns1: string, ns2: string) {
+  if (ns1 === ns2) return '.';
+
+  const parts1 = ns1 ? ns1.split('.') : [];
+  const parts2 = ns2 ? ns2.split('.') : [];
+
+  while (parts1.length && parts2.length) {
+    if (parts1[0] !== parts2[0]) break;
+
+    parts1.shift();
+    parts2.shift();
+  }
+
+  const up = '../'.repeat(parts1.length) || '.';
+  const down = parts2.reduce((acc, p) => acc + '/' + strings.dasherize(p), '');
+
+  return removeTrailingSlash(removeDoubleSlash(up + down));
 }
 
 function removeDoubleSlash(path: string) {