Move struct out of model folder.

src/index.ts

@@ -5,8 +5,8 @@ import { resolve as resolvePath } from 'path'
 import { URL } from 'url'
 import { inspect } from 'util'
 import yargs from 'yargs'
-import { DistributionStructure } from './model/struct/model/distribution.struct'
-import { ServerStructure } from './model/struct/model/server.struct'
+import { DistributionStructure } from './structure/spec_model/Distribution.struct'
+import { ServerStructure } from './structure/spec_model/Server.struct'
 import { VersionSegmentedRegistry } from './util/VersionSegmentedRegistry'
 import { VersionUtil } from './util/versionutil'
 import { MinecraftVersion } from './util/MinecraftVersion'

src/resolver/forge/adapter/ForgeGradle2.resolver.ts

@@ -3,7 +3,7 @@ import { copy, lstat, mkdirs, pathExists, readFile, remove } from 'fs-extra'
 import { Module, Type } from 'helios-distribution-types'
 import { basename, join } from 'path'
 import { VersionManifestFG2 } from '../../../model/forge/VersionManifestFG2'
-import { LibRepoStructure } from '../../../model/struct/repo/librepo.struct'
+import { LibRepoStructure } from '../../../structure/repo/LibRepo.struct'
 import { MavenUtil } from '../../../util/maven'
 import { PackXZExtractWrapper } from '../../../util/java/PackXZExtractWrapper'
 import { VersionUtil } from '../../../util/versionutil'

src/resolver/forge/adapter/ForgeGradle3.resolver.ts

@@ -3,7 +3,7 @@ import { MinecraftVersion } from '../../../util/MinecraftVersion'
 import { LoggerUtil } from '../../../util/LoggerUtil'
 import { VersionUtil } from '../../../util/versionutil'
 import { Module, Type } from 'helios-distribution-types'
-import { LibRepoStructure } from '../../../model/struct/repo/librepo.struct'
+import { LibRepoStructure } from '../../../structure/repo/LibRepo.struct'
 import { pathExists, remove, mkdirs, copy, writeFile, readFile, lstat, move, writeJson } from 'fs-extra'
 import { join, basename, dirname } from 'path'
 import { spawn } from 'child_process'

src/resolver/forge/forge.resolver.ts

@@ -2,7 +2,7 @@ import StreamZip from 'node-stream-zip'
 import { createHash } from 'crypto'
 import { Stats } from 'fs-extra'
 import { Artifact } from 'helios-distribution-types'
-import { RepoStructure } from '../../model/struct/repo/repo.struct'
+import { RepoStructure } from '../../structure/repo/Repo.struct'
 import { BaseResolver } from '../baseresolver'
 import { MinecraftVersion } from '../../util/MinecraftVersion'
 

src/structure/BaseFileStructure.ts

@@ -2,7 +2,7 @@ import { mkdirs } from 'fs-extra'
 import { join, resolve } from 'path'
 import { FileStructure } from './FileStructure'
 import { Logger } from 'winston'
-import { LoggerUtil } from '../../util/LoggerUtil'
+import { LoggerUtil } from '../util/LoggerUtil'
 
 export abstract class BaseFileStructure implements FileStructure {
 

src/structure/repo/BaseMavenRepo.ts

@@ -2,9 +2,9 @@ import got from 'got'
 import { createWriteStream, mkdirs, pathExists } from 'fs-extra'
 import { dirname, join, resolve } from 'path'
 import { resolve as resolveURL } from 'url'
-import { MavenUtil } from '../../../util/maven'
+import { MavenUtil } from '../../util/maven'
 import { BaseFileStructure } from '../BaseFileStructure'
-import { LoggerUtil } from '../../../util/LoggerUtil'
+import { LoggerUtil } from '../../util/LoggerUtil'
 
 export abstract class BaseMavenRepo extends BaseFileStructure {
 

src/structure/repo/Repo.struct.ts

@@ -1,7 +1,7 @@
 import { join } from 'path'
 import { BaseFileStructure } from '../BaseFileStructure'
-import { LibRepoStructure } from './librepo.struct'
-import { VersionRepoStructure } from './versionrepo.struct'
+import { LibRepoStructure } from './LibRepo.struct'
+import { VersionRepoStructure } from './VersionRepo.struct'
 
 export class RepoStructure extends BaseFileStructure {
 

src/structure/repo/VersionRepo.struct.ts

@@ -1,7 +1,7 @@
 import { join } from 'path'
 import { resolve as resolveURL } from 'url'
 import { BaseFileStructure } from '../BaseFileStructure'
-import { MinecraftVersion } from '../../../util/MinecraftVersion'
+import { MinecraftVersion } from '../../util/MinecraftVersion'
 
 export class VersionRepoStructure extends BaseFileStructure {
 

src/structure/spec_model/BaseModel.struct.ts

@@ -1,7 +1,7 @@
 import { BaseFileStructure } from '../BaseFileStructure'
-import { ModelStructure } from './ModelStructure'
+import { SpecModelStructure } from './SpecModelStructure'
 
-export abstract class BaseModelStructure<T> extends BaseFileStructure implements ModelStructure<T[]> {
+export abstract class BaseModelStructure<T> extends BaseFileStructure implements SpecModelStructure<T[]> {
 
     protected resolvedModels: T[] | undefined
 

src/structure/spec_model/Distribution.struct.ts

@@ -1,11 +1,11 @@
 import { mkdirs, writeFile, readFile } from 'fs-extra'
 import { Distribution } from 'helios-distribution-types'
-import { ModelStructure } from './ModelStructure'
-import { ServerStructure } from './server.struct'
+import { SpecModelStructure } from './SpecModelStructure'
+import { ServerStructure } from './Server.struct'
 import { join, resolve } from 'path'
-import { DistroMeta, getDefaultDistroMeta } from '../../nebula/distrometa'
+import { DistroMeta, getDefaultDistroMeta } from '../../model/nebula/distrometa'
 
-export class DistributionStructure implements ModelStructure<Distribution> {
+export class DistributionStructure implements SpecModelStructure<Distribution> {
 
     private readonly DISTRO_META_FILE = 'distrometa.json'
 

src/structure/spec_model/Server.struct.ts

@@ -2,13 +2,13 @@ import { lstat, mkdirs, pathExists, readdir, readFile, writeFile } from 'fs-extr
 import { Server, Module } from 'helios-distribution-types'
 import { dirname, join, resolve as resolvePath } from 'path'
 import { resolve as resolveUrl } from 'url'
-import { VersionSegmentedRegistry } from '../../../util/VersionSegmentedRegistry'
-import { ServerMeta, getDefaultServerMeta, ServerMetaOptions } from '../../nebula/servermeta'
-import { BaseModelStructure } from './basemodel.struct'
-import { MiscFileStructure } from './module/file.struct'
-import { LiteModStructure } from './module/litemod.struct'
-import { LibraryStructure } from './module/library.struct'
-import { MinecraftVersion } from '../../../util/MinecraftVersion'
+import { VersionSegmentedRegistry } from '../../util/VersionSegmentedRegistry'
+import { ServerMeta, getDefaultServerMeta, ServerMetaOptions } from '../../model/nebula/servermeta'
+import { BaseModelStructure } from './BaseModel.struct'
+import { MiscFileStructure } from './module/File.struct'
+import { LiteModStructure } from './module/LiteMod.struct'
+import { LibraryStructure } from './module/Library.struct'
+import { MinecraftVersion } from '../../util/MinecraftVersion'
 
 export class ServerStructure extends BaseModelStructure<Server> {
 

src/structure/spec_model/SpecModelStructure.ts

@@ -1,6 +1,6 @@
 import { FileStructure } from '../FileStructure'
 
-export interface ModelStructure<T> extends FileStructure {
+export interface SpecModelStructure<T> extends FileStructure {
 
     getSpecModel(): Promise<T>
 

src/structure/spec_model/module/File.struct.ts

@@ -2,10 +2,10 @@
 import { Stats } from 'fs'
 import { Type, Module } from 'helios-distribution-types'
 import { resolve as resolveURL } from 'url'
-import { ModuleStructure } from './module.struct'
+import { ModuleStructure } from './Module.struct'
 import { readdir, stat } from 'fs-extra'
 import { join, resolve, sep } from 'path'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
 
 export class MiscFileStructure extends ModuleStructure {
 

src/structure/spec_model/module/ForgeMod.struct.ts

@@ -2,11 +2,11 @@ import { Stats } from 'fs-extra'
 import { Type, Module } from 'helios-distribution-types'
 import { join } from 'path'
 import { resolve } from 'url'
-import { VersionSegmented } from '../../../../util/VersionSegmented'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
-import { ToggleableModuleStructure } from './toggleablemodule.struct'
-import { LibraryType } from '../../../claritas/ClaritasLibraryType'
-import { ClaritasException } from './module.struct'
+import { VersionSegmented } from '../../../util/VersionSegmented'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
+import { ToggleableModuleStructure } from './ToggleableModule.struct'
+import { LibraryType } from '../../../model/claritas/ClaritasLibraryType'
+import { ClaritasException } from './Module.struct'
 
 export abstract class BaseForgeModStructure extends ToggleableModuleStructure implements VersionSegmented {
 

src/structure/spec_model/module/Library.struct.ts

@@ -1,9 +1,9 @@
-import { ModuleStructure } from './module.struct'
+import { ModuleStructure } from './Module.struct'
 import { Type, TypeMetadata } from 'helios-distribution-types'
 import { Stats } from 'fs-extra'
 import { join } from 'path'
 import { resolve } from 'url'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
 
 export class LibraryStructure extends ModuleStructure {
 

src/structure/spec_model/module/LiteMod.struct.ts

@@ -3,12 +3,12 @@ import { Stats } from 'fs-extra'
 import { Type } from 'helios-distribution-types'
 import { join } from 'path'
 import { resolve } from 'url'
-import { capitalize } from '../../../../util/stringutils'
-import { LiteMod } from '../../../liteloader/litemod'
-import { ToggleableModuleStructure } from './toggleablemodule.struct'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
-import { LibraryType } from '../../../claritas/ClaritasLibraryType'
-import { MetadataUtil } from '../../../../util/MetadataUtil'
+import { capitalize } from '../../../util/stringutils'
+import { LiteMod } from '../../../model/liteloader/litemod'
+import { ToggleableModuleStructure } from './ToggleableModule.struct'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
+import { LibraryType } from '../../../model/claritas/ClaritasLibraryType'
+import { MetadataUtil } from '../../../util/MetadataUtil'
 
 export class LiteModStructure extends ToggleableModuleStructure {
 

src/structure/spec_model/module/Module.struct.ts

@@ -2,11 +2,11 @@ import { createHash } from 'crypto'
 import { lstat, pathExists, readdir, readFile, Stats } from 'fs-extra'
 import { Module, Type, TypeMetadata } from 'helios-distribution-types'
 import { resolve } from 'path'
-import { BaseModelStructure } from '../basemodel.struct'
-import { LibraryType } from '../../../claritas/ClaritasLibraryType'
-import { ClaritasResult, ClaritasModuleMetadata } from '../../../claritas/ClaritasResult'
-import { ClaritasWrapper } from '../../../../util/java/ClaritasWrapper'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { BaseModelStructure } from '../BaseModel.struct'
+import { LibraryType } from '../../../model/claritas/ClaritasLibraryType'
+import { ClaritasResult, ClaritasModuleMetadata } from '../../../model/claritas/ClaritasResult'
+import { ClaritasWrapper } from '../../../util/java/ClaritasWrapper'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
 
 export interface ModuleCandidate {
     file: string

src/structure/spec_model/module/ToggleableModule.struct.ts

@@ -1,8 +1,8 @@
-import { ModuleStructure, ModuleCandidate } from './module.struct'
+import { ModuleStructure, ModuleCandidate } from './Module.struct'
 import { Type, Module } from 'helios-distribution-types'
 import { Stats, mkdirs } from 'fs-extra'
 import { resolve } from 'path'
-import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { MinecraftVersion } from '../../../util/MinecraftVersion'
 
 export enum ToggleableNamespace {
 

src/structure/spec_model/module/forgemod/ForgeMod113.struct.ts

@@ -1,10 +1,10 @@
 import StreamZip from 'node-stream-zip'
 import toml from 'toml'
-import { capitalize } from '../../../../../util/stringutils'
-import { VersionUtil } from '../../../../../util/versionutil'
-import { ModsToml } from '../../../../forge/modstoml'
-import { BaseForgeModStructure } from '../forgemod.struct'
-import { MinecraftVersion } from '../../../../../util/MinecraftVersion'
+import { capitalize } from '../../../../util/stringutils'
+import { VersionUtil } from '../../../../util/versionutil'
+import { ModsToml } from '../../../../model/forge/modstoml'
+import { BaseForgeModStructure } from '../ForgeMod.struct'
+import { MinecraftVersion } from '../../../../util/MinecraftVersion'
 
 export class ForgeModStructure113 extends BaseForgeModStructure {
 

src/structure/spec_model/module/forgemod/ForgeMod17.struct.ts

@@ -1,11 +1,11 @@
 import StreamZip from 'node-stream-zip'
-import { capitalize } from '../../../../../util/stringutils'
-import { VersionUtil } from '../../../../../util/versionutil'
-import { McModInfo } from '../../../../forge/mcmodinfo'
-import { McModInfoList } from '../../../../forge/mcmodinfolist'
-import { BaseForgeModStructure } from '../forgemod.struct'
-import { MinecraftVersion } from '../../../../../util/MinecraftVersion'
-import { ForgeModType_1_7 } from '../../../../claritas/ClaritasResult'
+import { capitalize } from '../../../../util/stringutils'
+import { VersionUtil } from '../../../../util/versionutil'
+import { McModInfo } from '../../../../model/forge/mcmodinfo'
+import { McModInfoList } from '../../../../model/forge/mcmodinfolist'
+import { BaseForgeModStructure } from '../ForgeMod.struct'
+import { MinecraftVersion } from '../../../../util/MinecraftVersion'
+import { ForgeModType_1_7 } from '../../../../model/claritas/ClaritasResult'
 
 export class ForgeModStructure17 extends BaseForgeModStructure {
 

src/util/VersionSegmentedRegistry.ts

@@ -1,9 +1,9 @@
-import { ForgeModStructure113 } from '../model/struct/model/module/forgemod/forgemod113.struct'
-import { ForgeModStructure17 } from '../model/struct/model/module/forgemod/forgemod17.struct'
+import { ForgeModStructure113 } from '../structure/spec_model/module/forgemod/ForgeMod113.struct'
+import { ForgeModStructure17 } from '../structure/spec_model/module/forgemod/ForgeMod17.struct'
 import { ForgeGradle3Adapter } from '../resolver/forge/adapter/ForgeGradle3.resolver'
 import { ForgeGradle2Adapter } from '../resolver/forge/adapter/ForgeGradle2.resolver'
 import { ForgeResolver } from '../resolver/forge/forge.resolver'
-import { BaseForgeModStructure } from '../model/struct/model/module/forgemod.struct'
+import { BaseForgeModStructure } from '../structure/spec_model/module/ForgeMod.struct'
 import { MinecraftVersion } from './MinecraftVersion'
 
 export class VersionSegmentedRegistry {