diff --git a/lib/clients/zdb/zdb.v b/lib/clients/zdb/zdb.v
index 846f4b5a..d2c7bbef 100644
--- a/lib/clients/zdb/zdb.v
+++ b/lib/clients/zdb/zdb.v
@@ -1,6 +1,6 @@
 module zdb
 
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 import freeflowuniverse.herolib.ui.console
 
 pub struct ZDB {
diff --git a/lib/code/generator/installer_client/model.v b/lib/code/generator/installer_client/model.v
index 33e9b59d..ceedc79a 100644
--- a/lib/code/generator/installer_client/model.v
+++ b/lib/code/generator/installer_client/model.v
@@ -34,15 +34,16 @@ pub enum Cat {
 
 pub fn gen_model_set(args GenerateArgs) ! {
 	model := args.model
-	heroscript_templ := $tmpl('templates/heroscript')
-
-	//TODO: look in lib/code/generator/installer_client/templates/heroscript, don't use the if in template, use 2 templates, depending type use other template, and the args used should be set here in code 
-
+	mut heroscript_templ := match model.cat {
+		.client { heroscript_templ := $tmpl('templates/heroscript_client' )}
+		.installer { heroscript_templ := $tmpl('templates/heroscript_installer' )}
+		else { return error('Invalid category: ${model.cat}') }
+	}
 	pathlib.template_write(heroscript_templ, '${args.path}/.heroscript', true)!
 }
 
 
-pub fn gen_model_get(path string, create: bool) !GenModel {
+pub fn gen_model_get(path string, create bool) !GenModel {
 	console.print_debug('play installer code for path: ${path}')
 
 	mut config_path := pathlib.get_file(path: '${path}/.heroscript', create: create)!
diff --git a/lib/code/generator/installer_client/templates/heroscript b/lib/code/generator/installer_client/templates/heroscript
deleted file mode 100644
index ea62721a..00000000
--- a/lib/code/generator/installer_client/templates/heroscript
+++ /dev/null
@@ -1,12 +0,0 @@
-!!hero_code.generate_${if model.cat == .installer { "installer" } else { "client" }}
-    name:"${model.name}"
-    classname:"${model.classname}"
-    config:${if model.hasconfig { "1" } else { "0" }}
-    singleton:${if model.singleton { "1" } else { "0" }}
-    default:${if model.default { "1" } else { "0" }}
-    title:\"${model.title}\"
-${if model.cat == .installer {
-    templates:${if model.templates { "1" } else { "0" }}
-    build:${if model.build { "1" } else { "0" }}
-    startupmanager:${if model.startupmanager { "1" } else { "0" }}
-}
diff --git a/lib/code/generator/installer_client/templates/heroscript_client b/lib/code/generator/installer_client/templates/heroscript_client
new file mode 100644
index 00000000..0df80669
--- /dev/null
+++ b/lib/code/generator/installer_client/templates/heroscript_client
@@ -0,0 +1,7 @@
+!!hero_code.generate_client
+    name: "${model.name}"
+    classname: "${model.classname}"
+    config: ${model.hasconfig}
+    singleton: ${model.singleton}
+    default: ${model.default}
+    title: "${model.title}|
diff --git a/lib/code/generator/installer_client/templates/heroscript_installer b/lib/code/generator/installer_client/templates/heroscript_installer
new file mode 100644
index 00000000..b0268e8d
--- /dev/null
+++ b/lib/code/generator/installer_client/templates/heroscript_installer
@@ -0,0 +1,11 @@
+!!hero_code.generate_installer
+    name: "${model.name}"
+    classname: "${model.classname}"
+    config: ${model.hasconfig}
+    singleton: ${model.singleton}
+    default: ${model.default}
+    title: "${model.title}"
+    templates: ${model.templates}
+    build: ${model.build}
+    startupmanager: ${model.startupmanager}
+
diff --git a/lib/core/base/context.v b/lib/core/base/context.v
index 36b7f8c7..2ec058da 100644
--- a/lib/core/base/context.v
+++ b/lib/core/base/context.v
@@ -1,7 +1,7 @@
 module base
 
 import freeflowuniverse.herolib.data.paramsparser
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 import freeflowuniverse.herolib.data.dbfs
 // import freeflowuniverse.herolib.crypt.secp256k1
 import freeflowuniverse.herolib.crypt.aes_symmetric
diff --git a/lib/core/httpconnection/connection.v b/lib/core/httpconnection/connection.v
index 724641cb..cbd48bb8 100644
--- a/lib/core/httpconnection/connection.v
+++ b/lib/core/httpconnection/connection.v
@@ -1,7 +1,7 @@
 module httpconnection
 
 import net.http { Header }
-import freeflowuniverse.herolib.clients.redisclient { Redis }
+import freeflowuniverse.herolib.core.redisclient { Redis }
 
 @[heap]
 pub struct HTTPConnection {
diff --git a/lib/core/httpconnection/factory.v b/lib/core/httpconnection/factory.v
index 9d227dbb..fdf9748a 100644
--- a/lib/core/httpconnection/factory.v
+++ b/lib/core/httpconnection/factory.v
@@ -1,7 +1,7 @@
 module httpconnection
 
 import net.http
-import freeflowuniverse.herolib.clients.redisclient { RedisURL }
+import freeflowuniverse.herolib.core.redisclient { RedisURL }
 
 @[params]
 pub struct HTTPConnectionArgs {
diff --git a/lib/core/redisclient/readme.md b/lib/core/redisclient/readme.md
index 831efad0..703f4414 100644
--- a/lib/core/redisclient/readme.md
+++ b/lib/core/redisclient/readme.md
@@ -4,7 +4,7 @@
 
 ```v
 
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 
 mut redis := redisclient.core_get()!
 redis.set('test', 'some data') or { panic('set' + err.str() + '\n' + c.str()) }
diff --git a/lib/core/redisclient/redisclient_sadd_test.v b/lib/core/redisclient/redisclient_sadd_test.v
index 6563ebec..561b37ad 100644
--- a/lib/core/redisclient/redisclient_sadd_test.v
+++ b/lib/core/redisclient/redisclient_sadd_test.v
@@ -1,4 +1,4 @@
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 
 fn setup() !&redisclient.Redis {
 	mut redis := redisclient.core_get()!
diff --git a/lib/core/redisclient/redisclient_test.v b/lib/core/redisclient/redisclient_test.v
index f15ef8c5..4fd4c9d7 100644
--- a/lib/core/redisclient/redisclient_test.v
+++ b/lib/core/redisclient/redisclient_test.v
@@ -1,4 +1,4 @@
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 import time
 import freeflowuniverse.herolib.ui.console
 // original code see https://github.com/patrickpissurno/vredis/blob/master/vredis_test.v
diff --git a/lib/core/redisclient/rpc_test.v b/lib/core/redisclient/rpc_test.v
index a2802aca..5dbc5713 100644
--- a/lib/core/redisclient/rpc_test.v
+++ b/lib/core/redisclient/rpc_test.v
@@ -1,4 +1,4 @@
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 import freeflowuniverse.herolib.ui.console
 
 fn setup() !&redisclient.Redis {
diff --git a/lib/core/smartid/sid.v b/lib/core/smartid/sid.v
index a7c5b2d7..af8aa6e1 100644
--- a/lib/core/smartid/sid.v
+++ b/lib/core/smartid/sid.v
@@ -1,6 +1,6 @@
 module smartid
 
-// import freeflowuniverse.herolib.clients.redisclient
+// import freeflowuniverse.herolib.core.redisclient
 import math
 // import freeflowuniverse.herolib.core.texttools.regext
 // import rand
diff --git a/lib/data/dbfs/dbcollection.v b/lib/data/dbfs/dbcollection.v
index 4e4fde52..ead4a2a9 100644
--- a/lib/data/dbfs/dbcollection.v
+++ b/lib/data/dbfs/dbcollection.v
@@ -2,7 +2,7 @@ module dbfs
 
 import freeflowuniverse.herolib.core.pathlib
 import freeflowuniverse.herolib.core.texttools
-// import freeflowuniverse.herolib.clients.redisclient	
+// import freeflowuniverse.herolib.core.redisclient	
 import os
 import json
 // import freeflowuniverse.herolib.ui.console
diff --git a/lib/data/dbfs/factory.v b/lib/data/dbfs/factory.v
index f7c35cc6..6ab17650 100644
--- a/lib/data/dbfs/factory.v
+++ b/lib/data/dbfs/factory.v
@@ -1,7 +1,7 @@
 module dbfs
 
 import freeflowuniverse.herolib.core.pathlib
-// import freeflowuniverse.herolib.clients.redisclient
+// import freeflowuniverse.herolib.core.redisclient
 import os
 
 @[params]
diff --git a/lib/develop/gittools/gitstructure.v b/lib/develop/gittools/gitstructure.v
index 4408ff8f..303ae938 100644
--- a/lib/develop/gittools/gitstructure.v
+++ b/lib/develop/gittools/gitstructure.v
@@ -2,7 +2,7 @@ module gittools
 
 import crypto.md5
 import freeflowuniverse.herolib.core.pathlib
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 import os
 import freeflowuniverse.herolib.ui.console
 
diff --git a/lib/develop/gittools/gittools_do.v b/lib/develop/gittools/gittools_do.v
index f172726a..b434ca54 100644
--- a/lib/develop/gittools/gittools_do.v
+++ b/lib/develop/gittools/gittools_do.v
@@ -4,7 +4,7 @@ import freeflowuniverse.herolib.ui as gui
 import freeflowuniverse.herolib.core.pathlib
 import freeflowuniverse.herolib.ui.console
 import freeflowuniverse.herolib.ui.generic
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 import os
 
 pub const gitcmds = 'clone,commit,pull,push,delete,reload,list,edit,sourcetree,cd'
diff --git a/lib/develop/gittools/repos_get.v b/lib/develop/gittools/repos_get.v
index 8e7f4638..9b4a20e8 100644
--- a/lib/develop/gittools/repos_get.v
+++ b/lib/develop/gittools/repos_get.v
@@ -1,6 +1,6 @@
 module gittools
 
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 import time
 
 // ReposGetArgs defines arguments to retrieve repositories from the git structure.
diff --git a/lib/develop/gittools/repository_cache.v b/lib/develop/gittools/repository_cache.v
index 49c3daf0..1e11517f 100644
--- a/lib/develop/gittools/repository_cache.v
+++ b/lib/develop/gittools/repository_cache.v
@@ -1,7 +1,7 @@
 module gittools
 
 import json
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 
 fn redis_get() redisclient.Redis {
 	mut redis_client := redisclient.core_get() or { panic(err) }
diff --git a/lib/develop/performance/README.md b/lib/develop/performance/README.md
index 36d16330..02a8516d 100644
--- a/lib/develop/performance/README.md
+++ b/lib/develop/performance/README.md
@@ -44,7 +44,7 @@ Display the recorded timeline:
 ## Dependencies
 
 	•	Redis: Requires a Redis server for data storage.
-	•	Redis Client: Uses freeflowuniverse.herolib.clients.redisclient.
+	•	Redis Client: Uses freeflowuniverse.herolib.core.redisclient.
 
 ## Example
 ```
diff --git a/lib/develop/performance/performance.v b/lib/develop/performance/performance.v
index 52710e29..b8997f05 100644
--- a/lib/develop/performance/performance.v
+++ b/lib/develop/performance/performance.v
@@ -4,7 +4,7 @@ import arrays
 import time
 import sync
 import term // For color coding
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 
 // Struct to represent a timer for measuring process performance
 @[noinit]
diff --git a/lib/ui/telegram/client/client.v b/lib/ui/telegram/client/client.v
index 9ebc6c2c..d8f8a2c5 100644
--- a/lib/ui/telegram/client/client.v
+++ b/lib/ui/telegram/client/client.v
@@ -1,7 +1,7 @@
 module client
 
 import freeflowuniverse.herolib.baobab.client
-import freeflowuniverse.herolib.clients.redisclient
+import freeflowuniverse.herolib.core.redisclient
 import dariotarantini.vgram
 import json