diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ResgenSwift-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ResgenSwift-Package.xcscheme
index 7d57f6c..49b0f71 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/ResgenSwift-Package.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/ResgenSwift-Package.xcscheme
@@ -146,6 +146,20 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ToolCore"
+               BuildableName = "ToolCore"
+               BlueprintName = "ToolCore"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
diff --git a/Package.swift b/Package.swift
index b5095cf..908cdda 100644
--- a/Package.swift
+++ b/Package.swift
@@ -20,21 +20,21 @@ let package = Package(
         .target(
             name: "FontTool",
             dependencies: [
-                "CLIToolCore",
+                "ToolCore",
                 .product(name: "ArgumentParser", package: "swift-argument-parser")
             ]
         ),
         .target(
             name: "ColorTool",
             dependencies: [
-                "CLIToolCore",
+                "ToolCore",
                 .product(name: "ArgumentParser", package: "swift-argument-parser")
             ]
         ),
         .target(
             name: "Strings",
             dependencies: [
-                "CLIToolCore",
+                "ToolCore",
                 .product(name: "ArgumentParser", package: "swift-argument-parser")
             ],
             sources: ["."] // Force include all subdirectories
@@ -42,12 +42,12 @@ let package = Package(
         .target(
             name: "Imagium",
             dependencies: [
-                "CLIToolCore",
+                "ToolCore",
                 .product(name: "ArgumentParser", package: "swift-argument-parser")
             ]
         ),
         // Helper targets
-        .target(name: "CLIToolCore"),
+        .target(name: "ToolCore"),
         // Test targets
         .testTarget(
             name: "ResgenSwiftTests",
diff --git a/Sources/ColorTool/ColorExtensionGenerator.swift b/Sources/ColorTool/ColorExtensionGenerator.swift
index ba2e1c3..75e8442 100644
--- a/Sources/ColorTool/ColorExtensionGenerator.swift
+++ b/Sources/ColorTool/ColorExtensionGenerator.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import ToolCore
 
 struct ColorExtensionGenerator {
     
@@ -15,7 +16,7 @@ struct ColorExtensionGenerator {
     
     func getHeader() -> String {
         """
-        // Generated from ColorToolCore at \(Date())
+        // Generated by ResgenSwift.ColorToolCore \(ResgenSwiftVersion)
 
         import UIKit
 
diff --git a/Sources/ColorTool/ColorXcassetHelper.swift b/Sources/ColorTool/ColorXcassetHelper.swift
index ec6e56f..6eb3191 100644
--- a/Sources/ColorTool/ColorXcassetHelper.swift
+++ b/Sources/ColorTool/ColorXcassetHelper.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 
 struct ColorXcassetHelper {
     
diff --git a/Sources/ColorTool/main.swift b/Sources/ColorTool/main.swift
index 0993f99..246a865 100644
--- a/Sources/ColorTool/main.swift
+++ b/Sources/ColorTool/main.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 import ArgumentParser
 
 enum ColorStyle: String, Decodable {
diff --git a/Sources/FontTool/FontToolContentGenerator.swift b/Sources/FontTool/FontToolContentGenerator.swift
index 9be2ede..5d82dba 100644
--- a/Sources/FontTool/FontToolContentGenerator.swift
+++ b/Sources/FontTool/FontToolContentGenerator.swift
@@ -6,12 +6,13 @@
 //
 
 import Foundation
+import ToolCore
 
 class FontToolContentGenerator {
     
     static func getExtensionHeader(fontsNames: [String]) -> String {
         """
-        // Generated from FontToolCore
+        // Generated by ResgenSwift.FontToolCore \(ResgenSwiftVersion)
         
         import UIKit
         
diff --git a/Sources/FontTool/FontToolHelper.swift b/Sources/FontTool/FontToolHelper.swift
index aea6118..af758fa 100644
--- a/Sources/FontTool/FontToolHelper.swift
+++ b/Sources/FontTool/FontToolHelper.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 
 class FontToolHelper {
     static func getFontsFilenames(fromInputFolder inputFolder: String) -> [String] {
diff --git a/Sources/FontTool/main.swift b/Sources/FontTool/main.swift
index 46aabc8..2949b5a 100644
--- a/Sources/FontTool/main.swift
+++ b/Sources/FontTool/main.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 import ArgumentParser
 
 struct FontTool: ParsableCommand {
diff --git a/Sources/Imagium/ImageExtensionGenerator.swift b/Sources/Imagium/ImageExtensionGenerator.swift
index 9c72735..f7fde30 100644
--- a/Sources/Imagium/ImageExtensionGenerator.swift
+++ b/Sources/Imagium/ImageExtensionGenerator.swift
@@ -5,7 +5,7 @@
 //  Created by Thibaut Schmitt on 14/02/2022.
 //
 
-import CLIToolCore
+import ToolCore
 import Foundation
 
 class ImageExtensionGenerator {
@@ -66,7 +66,7 @@ class ImageExtensionGenerator {
     
     private static func getHeader(inputFilename: String, extensionClassname: String) -> String {
         """
-        // Generated from Imagium at \(Date())
+        // Generated by ResgenSwift.Imagium \(ResgenSwiftVersion)
         // Images from \(inputFilename)
         
         import UIKit
diff --git a/Sources/Imagium/XcassetsGenerator.swift b/Sources/Imagium/XcassetsGenerator.swift
index 54a5ea0..39ae382 100644
--- a/Sources/Imagium/XcassetsGenerator.swift
+++ b/Sources/Imagium/XcassetsGenerator.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 
 class XcassetsGenerator {
     
diff --git a/Sources/Imagium/main.swift b/Sources/Imagium/main.swift
index dc4637c..fb2c529 100644
--- a/Sources/Imagium/main.swift
+++ b/Sources/Imagium/main.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import ArgumentParser
-import CLIToolCore
+import ToolCore
 
 enum PlatormTag: String {
     case droid = "d"
diff --git a/Sources/ResgenSwift/main.swift b/Sources/ResgenSwift/main.swift
index c2d7115..1830a03 100644
--- a/Sources/ResgenSwift/main.swift
+++ b/Sources/ResgenSwift/main.swift
@@ -1,13 +1 @@
 print("Welcome ResgenSwift")
-
-/*
- Make resgen as main command and font/color... as subcommands. It could look like:
- Resgen
-    -> ColorTool
-    -> FontTool
-    -> ImageTool
-    -> Strings
-        -> Twine
-        -> Stringium
-        -> Tag
- */
diff --git a/Sources/Strings/Generator/StringsFileGenerator.swift b/Sources/Strings/Generator/StringsFileGenerator.swift
index e4d41d4..7fd7ca4 100644
--- a/Sources/Strings/Generator/StringsFileGenerator.swift
+++ b/Sources/Strings/Generator/StringsFileGenerator.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 
 class StringsFileGenerator {
     
@@ -41,7 +41,7 @@ class StringsFileGenerator {
         var stringsFileContent = """
         /**
          * Apple Strings File
-         * Generated by ResgenSwift 1.0.0
+         * Generated by ResgenSwift \(ResgenSwiftVersion)
          * Language: \(lang)
          */\n
         """
@@ -123,7 +123,7 @@ class StringsFileGenerator {
     
     private static func getHeader(stringsFilename: String, extensionClassname: String) -> String {
         """
-        // Generated from Strings-Stringium at \(Date())
+        // Generated by ResgenSwift.Strings.Stringium \(ResgenSwiftVersion)
         
         import UIKit
         
diff --git a/Sources/Strings/Generator/TagsGenerator.swift b/Sources/Strings/Generator/TagsGenerator.swift
index bb7e1f1..32bd324 100644
--- a/Sources/Strings/Generator/TagsGenerator.swift
+++ b/Sources/Strings/Generator/TagsGenerator.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 import CoreVideo
 
 class TagsGenerator {
@@ -57,7 +57,7 @@ class TagsGenerator {
     
     private static func getHeader(extensionClassname: String) -> String {
             """
-            // Generated from Strings-Tags at \(Date())
+            // Generated by ResgenSwift.Strings.Tags \(ResgenSwiftVersion)
             
             // typelias Tags = String
             
diff --git a/Sources/Strings/Stringium/Stringium.swift b/Sources/Strings/Stringium/Stringium.swift
index 3d2367d..cbc7bf8 100644
--- a/Sources/Strings/Stringium/Stringium.swift
+++ b/Sources/Strings/Stringium/Stringium.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 import ArgumentParser
 
 struct Stringium: ParsableCommand {
diff --git a/Sources/Strings/Tag/Tags.swift b/Sources/Strings/Tag/Tags.swift
index 3936b0a..18278cf 100644
--- a/Sources/Strings/Tag/Tags.swift
+++ b/Sources/Strings/Tag/Tags.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 import ArgumentParser
 
 struct Tags: ParsableCommand {
diff --git a/Sources/Strings/Twine/Twine.swift b/Sources/Strings/Twine/Twine.swift
index 0b4e9ca..53626fd 100644
--- a/Sources/Strings/Twine/Twine.swift
+++ b/Sources/Strings/Twine/Twine.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CLIToolCore
+import ToolCore
 import ArgumentParser
 
 struct Twine: ParsableCommand {
diff --git a/Sources/CLIToolCore/GeneratorChecker.swift b/Sources/ToolCore/GeneratorChecker.swift
similarity index 100%
rename from Sources/CLIToolCore/GeneratorChecker.swift
rename to Sources/ToolCore/GeneratorChecker.swift
diff --git a/Sources/CLIToolCore/SequenceExtensions.swift b/Sources/ToolCore/SequenceExtensions.swift
similarity index 100%
rename from Sources/CLIToolCore/SequenceExtensions.swift
rename to Sources/ToolCore/SequenceExtensions.swift
diff --git a/Sources/CLIToolCore/Shell.swift b/Sources/ToolCore/Shell.swift
similarity index 100%
rename from Sources/CLIToolCore/Shell.swift
rename to Sources/ToolCore/Shell.swift
diff --git a/Sources/CLIToolCore/StringExtensions.swift b/Sources/ToolCore/StringExtensions.swift
similarity index 100%
rename from Sources/CLIToolCore/StringExtensions.swift
rename to Sources/ToolCore/StringExtensions.swift
diff --git a/Sources/ToolCore/Version.swift b/Sources/ToolCore/Version.swift
new file mode 100644
index 0000000..7f4ef35
--- /dev/null
+++ b/Sources/ToolCore/Version.swift
@@ -0,0 +1,10 @@
+//
+//  Version.swift
+//  
+//
+//  Created by Thibaut Schmitt on 25/07/2022.
+//
+
+import Foundation
+
+public let ResgenSwiftVersion = "1.0.0"