diff --git a/rapidoid-activity/src/main/java/org/rapidoid/activity/AbstractLoopThread.java b/rapidoid-activity/src/main/java/org/rapidoid/activity/AbstractLoopThread.java
index 4688c39b11..8820da803d 100644
--- a/rapidoid-activity/src/main/java/org/rapidoid/activity/AbstractLoopThread.java
+++ b/rapidoid-activity/src/main/java/org/rapidoid/activity/AbstractLoopThread.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-activity/src/main/java/org/rapidoid/activity/LifecycleActivity.java b/rapidoid-activity/src/main/java/org/rapidoid/activity/LifecycleActivity.java
index 5720aa175e..82ae11e8b4 100644
--- a/rapidoid-activity/src/main/java/org/rapidoid/activity/LifecycleActivity.java
+++ b/rapidoid-activity/src/main/java/org/rapidoid/activity/LifecycleActivity.java
@@ -4,7 +4,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-anyobj/src/main/java/org/rapidoid/anyobj/AnyObj.java b/rapidoid-anyobj/src/main/java/org/rapidoid/anyobj/AnyObj.java
index 4e328301ae..9513cb5a29 100644
--- a/rapidoid-anyobj/src/main/java/org/rapidoid/anyobj/AnyObj.java
+++ b/rapidoid-anyobj/src/main/java/org/rapidoid/anyobj/AnyObj.java
@@ -23,7 +23,7 @@
 import java.util.Collection;
 
 import org.rapidoid.arr.Arr;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /**
  * @author Nikolche Mihajlovski
diff --git a/rapidoid-anyobj/src/test/java/org/rapidoid/anyobj/AnyObjTest.java b/rapidoid-anyobj/src/test/java/org/rapidoid/anyobj/AnyObjTest.java
index cedb51c1ba..fe5dc461e8 100644
--- a/rapidoid-anyobj/src/test/java/org/rapidoid/anyobj/AnyObjTest.java
+++ b/rapidoid-anyobj/src/test/java/org/rapidoid/anyobj/AnyObjTest.java
@@ -22,7 +22,7 @@
 
 import org.junit.Test;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /**
  * @author Nikolche Mihajlovski
diff --git a/rapidoid-aop/src/main/java/org/rapidoid/aop/InterceptorConfig.java b/rapidoid-aop/src/main/java/org/rapidoid/aop/InterceptorConfig.java
index d6d509417b..9ed7a02d2d 100644
--- a/rapidoid-aop/src/main/java/org/rapidoid/aop/InterceptorConfig.java
+++ b/rapidoid-aop/src/main/java/org/rapidoid/aop/InterceptorConfig.java
@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/AppClasses.java b/rapidoid-app/src/main/java/org/rapidoid/app/AppClasses.java
index 3d6a28bd9a..180e680a2e 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/AppClasses.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/AppClasses.java
@@ -28,7 +28,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.annotation.Web;
 import org.rapidoid.beany.Metadata;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/AppHandler.java b/rapidoid-app/src/main/java/org/rapidoid/app/AppHandler.java
index 4ef70baa87..d72bb7cee2 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/AppHandler.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/AppHandler.java
@@ -41,7 +41,7 @@
 import org.rapidoid.http.HttpExchangeImpl;
 import org.rapidoid.io.Res;
 import org.rapidoid.plugins.templates.Templates;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.webapp.AppCtx;
 import org.rapidoid.webapp.WebApp;
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/AppReloadHandler.java b/rapidoid-app/src/main/java/org/rapidoid/app/AppReloadHandler.java
index a8d880d3d6..369f65a3fe 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/AppReloadHandler.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/AppReloadHandler.java
@@ -32,7 +32,7 @@
 import org.rapidoid.io.IO;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.lambda.Predicate;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/Apps.java b/rapidoid-app/src/main/java/org/rapidoid/app/Apps.java
index 16c497da8f..86f4755069 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/Apps.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/Apps.java
@@ -46,7 +46,7 @@
 import org.rapidoid.plugins.lifecycle.LifecyclePlugin;
 import org.rapidoid.plugins.templates.MustacheTemplatesPlugin;
 import org.rapidoid.plugins.users.UsersPlugin;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Usage;
 import org.rapidoid.webapp.Scan;
 import org.rapidoid.webapp.WebApp;
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/CRUD.java b/rapidoid-app/src/main/java/org/rapidoid/app/CRUD.java
index 74be48f1a9..a935968c7f 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/CRUD.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/CRUD.java
@@ -30,7 +30,7 @@
 import org.rapidoid.annotation.PUT;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.plugins.db.DB;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/Dollar.java b/rapidoid-app/src/main/java/org/rapidoid/app/Dollar.java
index 37b07bed60..cd276bdbe9 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/Dollar.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/Dollar.java
@@ -24,7 +24,7 @@
 import org.rapidoid.plugins.users.UsersPlugin;
 import org.rapidoid.sql.SQL;
 import org.rapidoid.sql.SQLAPI;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import redis.clients.jedis.Jedis;
 
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/GenericGUI.java b/rapidoid-app/src/main/java/org/rapidoid/app/GenericGUI.java
index 8b79277767..83b1d634f8 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/GenericGUI.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/GenericGUI.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.http.HttpExchange;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/IOToolImpl.java b/rapidoid-app/src/main/java/org/rapidoid/app/IOToolImpl.java
index 05f4b02750..3b7277fc26 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/IOToolImpl.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/IOToolImpl.java
@@ -27,7 +27,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.io.IO;
 import org.rapidoid.io.Res;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.2.0")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/JedisTool.java b/rapidoid-app/src/main/java/org/rapidoid/app/JedisTool.java
index 16f11fd5d6..23f656b590 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/JedisTool.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/JedisTool.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.config.Conf;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import redis.clients.jedis.Jedis;
 
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/Scripting.java b/rapidoid-app/src/main/java/org/rapidoid/app/Scripting.java
index 78c165ec75..cc9cab951b 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/Scripting.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/Scripting.java
@@ -40,7 +40,7 @@
 import org.rapidoid.io.Res;
 import org.rapidoid.job.Jobs;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.AppCtx;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/TransactionInterceptor.java b/rapidoid-app/src/main/java/org/rapidoid/app/TransactionInterceptor.java
index 4cdc66e4a8..9200bcd3a8 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/TransactionInterceptor.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/TransactionInterceptor.java
@@ -33,7 +33,7 @@
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.log.Log;
 import org.rapidoid.plugins.db.DB;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 public class TransactionInterceptor implements AOPInterceptor {
 
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/BuiltInCmdHandler.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/BuiltInCmdHandler.java
index 3171b8087a..28af048e8e 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/BuiltInCmdHandler.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/BuiltInCmdHandler.java
@@ -23,7 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.http.HttpExchange;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java
index e00323e1e2..fdf9f0fc5e 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java
@@ -26,7 +26,7 @@
 import org.rapidoid.ctx.Roles;
 import org.rapidoid.html.Tag;
 import org.rapidoid.security.annotation.DevMode;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.AppCtx;
 import org.rapidoid.widget.FormWidget;
 
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java
index f47771b442..2a5845138d 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.html.Tag;
 import org.rapidoid.plugins.db.DB;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.FormWidget;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java
index d6c2798c80..88e4e764c4 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java
@@ -25,7 +25,7 @@
 import org.rapidoid.html.Tag;
 import org.rapidoid.plugins.db.DB;
 import org.rapidoid.plugins.entities.Entities;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.FormWidget;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java
index 46fa334379..87fe3bae74 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java
@@ -30,7 +30,7 @@
 import org.rapidoid.http.HttpExchange;
 import org.rapidoid.model.Items;
 import org.rapidoid.plugins.db.DB;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.GridWidget;
 import org.rapidoid.widget.HighlightedGridWidget;
 
diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java
index dfb38b46c6..d06a7fb260 100644
--- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java
+++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java
@@ -26,7 +26,7 @@
 import org.rapidoid.html.Tag;
 import org.rapidoid.plugins.db.DB;
 import org.rapidoid.security.Secure;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.AppCtx;
 import org.rapidoid.widget.ButtonWidget;
 import org.rapidoid.widget.FormWidget;
diff --git a/rapidoid-arr/src/main/java/org/rapidoid/arr/Arr.java b/rapidoid-arr/src/main/java/org/rapidoid/arr/Arr.java
index 548d610d5a..d3b533ed09 100644
--- a/rapidoid-arr/src/main/java/org/rapidoid/arr/Arr.java
+++ b/rapidoid-arr/src/main/java/org/rapidoid/arr/Arr.java
@@ -22,7 +22,7 @@
 
 import java.util.Arrays;
 
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /**
  * @author Nikolche Mihajlovski
diff --git a/rapidoid-beany/src/main/java/org/rapidoid/beany/BeanProp.java b/rapidoid-beany/src/main/java/org/rapidoid/beany/BeanProp.java
index e81d0a0751..b34126cb25 100644
--- a/rapidoid-beany/src/main/java/org/rapidoid/beany/BeanProp.java
+++ b/rapidoid-beany/src/main/java/org/rapidoid/beany/BeanProp.java
@@ -33,7 +33,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.cls.TypeKind;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-beany/src/main/java/org/rapidoid/beany/BeanProperties.java b/rapidoid-beany/src/main/java/org/rapidoid/beany/BeanProperties.java
index 05dc283292..a0c163a2bf 100644
--- a/rapidoid-beany/src/main/java/org/rapidoid/beany/BeanProperties.java
+++ b/rapidoid-beany/src/main/java/org/rapidoid/beany/BeanProperties.java
@@ -35,7 +35,7 @@
 import org.rapidoid.cls.Cls;
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.lambda.Mapper;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-beany/src/main/java/org/rapidoid/beany/Beany.java b/rapidoid-beany/src/main/java/org/rapidoid/beany/Beany.java
index d66d557b0d..40790f0af5 100644
--- a/rapidoid-beany/src/main/java/org/rapidoid/beany/Beany.java
+++ b/rapidoid-beany/src/main/java/org/rapidoid/beany/Beany.java
@@ -26,7 +26,7 @@
 import org.rapidoid.dates.Dates;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 import org.rapidoid.var.Vars;
 
diff --git a/rapidoid-beany/src/main/java/org/rapidoid/beany/MapProp.java b/rapidoid-beany/src/main/java/org/rapidoid/beany/MapProp.java
index 2c899ef969..21cd1ea9a5 100644
--- a/rapidoid-beany/src/main/java/org/rapidoid/beany/MapProp.java
+++ b/rapidoid-beany/src/main/java/org/rapidoid/beany/MapProp.java
@@ -28,7 +28,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.cls.TypeKind;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-beany/src/main/java/org/rapidoid/beany/Metadata.java b/rapidoid-beany/src/main/java/org/rapidoid/beany/Metadata.java
index b3d7f86a8f..54c6399d57 100644
--- a/rapidoid-beany/src/main/java/org/rapidoid/beany/Metadata.java
+++ b/rapidoid-beany/src/main/java/org/rapidoid/beany/Metadata.java
@@ -7,7 +7,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-beany/src/test/java/org/rapidoid/beany/BeanySerializationTest.java b/rapidoid-beany/src/test/java/org/rapidoid/beany/BeanySerializationTest.java
index 61b64cf990..771977b69e 100644
--- a/rapidoid-beany/src/test/java/org/rapidoid/beany/BeanySerializationTest.java
+++ b/rapidoid-beany/src/test/java/org/rapidoid/beany/BeanySerializationTest.java
@@ -25,7 +25,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 import org.rapidoid.var.Vars;
 
diff --git a/rapidoid-buffer/src/main/java/org/rapidoid/buffer/MultiBuf.java b/rapidoid-buffer/src/main/java/org/rapidoid/buffer/MultiBuf.java
index 4c79aa8672..016b5af466 100644
--- a/rapidoid-buffer/src/main/java/org/rapidoid/buffer/MultiBuf.java
+++ b/rapidoid-buffer/src/main/java/org/rapidoid/buffer/MultiBuf.java
@@ -35,9 +35,9 @@
 import org.rapidoid.data.Range;
 import org.rapidoid.data.Ranges;
 import org.rapidoid.pool.Pool;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.D;
-import org.rapidoid.util.U;
 import org.rapidoid.wrap.IntWrap;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-buffer/src/main/java/org/rapidoid/bytes/BytesUtil.java b/rapidoid-buffer/src/main/java/org/rapidoid/bytes/BytesUtil.java
index 5d4fc11c35..20b70a703c 100644
--- a/rapidoid-buffer/src/main/java/org/rapidoid/bytes/BytesUtil.java
+++ b/rapidoid-buffer/src/main/java/org/rapidoid/bytes/BytesUtil.java
@@ -24,8 +24,8 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.data.Range;
 import org.rapidoid.data.Ranges;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.wrap.IntWrap;
 
diff --git a/rapidoid-buffer/src/main/java/org/rapidoid/data/KeyValueRanges.java b/rapidoid-buffer/src/main/java/org/rapidoid/data/KeyValueRanges.java
index c47b3585bb..fd7e0e5a0a 100644
--- a/rapidoid-buffer/src/main/java/org/rapidoid/data/KeyValueRanges.java
+++ b/rapidoid-buffer/src/main/java/org/rapidoid/data/KeyValueRanges.java
@@ -26,7 +26,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.buffer.Buf;
 import org.rapidoid.bytes.BytesUtil;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-buffer/src/main/java/org/rapidoid/data/Range.java b/rapidoid-buffer/src/main/java/org/rapidoid/data/Range.java
index c37539a1da..3b91034868 100644
--- a/rapidoid-buffer/src/main/java/org/rapidoid/data/Range.java
+++ b/rapidoid-buffer/src/main/java/org/rapidoid/data/Range.java
@@ -25,7 +25,7 @@
 import org.rapidoid.buffer.Buf;
 import org.rapidoid.bytes.Bytes;
 import org.rapidoid.bytes.BytesUtil;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-buffer/src/main/java/org/rapidoid/data/Ranges.java b/rapidoid-buffer/src/main/java/org/rapidoid/data/Ranges.java
index 46a2f36bab..0cb28afbc3 100644
--- a/rapidoid-buffer/src/main/java/org/rapidoid/data/Ranges.java
+++ b/rapidoid-buffer/src/main/java/org/rapidoid/data/Ranges.java
@@ -28,7 +28,7 @@
 import org.rapidoid.buffer.Buf;
 import org.rapidoid.bytes.Bytes;
 import org.rapidoid.bytes.BytesUtil;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-buffer/src/test/java/org/rapidoid/buffer/BufTest.java b/rapidoid-buffer/src/test/java/org/rapidoid/buffer/BufTest.java
index f12825bc86..10f930505a 100644
--- a/rapidoid-buffer/src/test/java/org/rapidoid/buffer/BufTest.java
+++ b/rapidoid-buffer/src/test/java/org/rapidoid/buffer/BufTest.java
@@ -26,9 +26,9 @@
 import org.rapidoid.bytes.BytesUtil;
 import org.rapidoid.data.Range;
 import org.rapidoid.data.Ranges;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.Rnd;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-buffer/src/test/java/org/rapidoid/buffer/StatisticalBufTest.java b/rapidoid-buffer/src/test/java/org/rapidoid/buffer/StatisticalBufTest.java
index 73baa8fe46..929925a2c4 100644
--- a/rapidoid-buffer/src/test/java/org/rapidoid/buffer/StatisticalBufTest.java
+++ b/rapidoid-buffer/src/test/java/org/rapidoid/buffer/StatisticalBufTest.java
@@ -23,7 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-cache-guava/src/test/java/org/rapidoid/plugins/cache/guava/CacheTest.java b/rapidoid-cache-guava/src/test/java/org/rapidoid/plugins/cache/guava/CacheTest.java
index ad4d3248c4..83eb93c7e5 100644
--- a/rapidoid-cache-guava/src/test/java/org/rapidoid/plugins/cache/guava/CacheTest.java
+++ b/rapidoid-cache-guava/src/test/java/org/rapidoid/plugins/cache/guava/CacheTest.java
@@ -32,7 +32,7 @@
 import org.rapidoid.plugins.cache.Cache;
 import org.rapidoid.plugins.cache.ICache;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-cache-memcached/src/main/java/org/rapidoid/plugins/cache/memcached/MemcachedCache.java b/rapidoid-cache-memcached/src/main/java/org/rapidoid/plugins/cache/memcached/MemcachedCache.java
index b16d459540..de5406f539 100644
--- a/rapidoid-cache-memcached/src/main/java/org/rapidoid/plugins/cache/memcached/MemcachedCache.java
+++ b/rapidoid-cache-memcached/src/main/java/org/rapidoid/plugins/cache/memcached/MemcachedCache.java
@@ -32,7 +32,7 @@
 import org.rapidoid.concurrent.Callback;
 import org.rapidoid.concurrent.Callbacks;
 import org.rapidoid.plugins.cache.AbstractCache;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.2.0")
diff --git a/rapidoid-cache-memcached/src/main/java/org/rapidoid/plugins/cache/memcached/MemcachedCachePlugin.java b/rapidoid-cache-memcached/src/main/java/org/rapidoid/plugins/cache/memcached/MemcachedCachePlugin.java
index 47229ca04e..9c594b59ca 100644
--- a/rapidoid-cache-memcached/src/main/java/org/rapidoid/plugins/cache/memcached/MemcachedCachePlugin.java
+++ b/rapidoid-cache-memcached/src/main/java/org/rapidoid/plugins/cache/memcached/MemcachedCachePlugin.java
@@ -11,7 +11,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.plugins.cache.AbstractCachePlugin;
 import org.rapidoid.plugins.cache.ICache;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-cache-memcached/src/test/java/org/rapidoid/plugins/cache/memcached/MemcachedCacheTest.java b/rapidoid-cache-memcached/src/test/java/org/rapidoid/plugins/cache/memcached/MemcachedCacheTest.java
index 3201a28adb..02c8f26005 100644
--- a/rapidoid-cache-memcached/src/test/java/org/rapidoid/plugins/cache/memcached/MemcachedCacheTest.java
+++ b/rapidoid-cache-memcached/src/test/java/org/rapidoid/plugins/cache/memcached/MemcachedCacheTest.java
@@ -36,7 +36,7 @@
 import org.rapidoid.plugins.cache.Cache;
 import org.rapidoid.plugins.cache.ICache;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 
 /**
diff --git a/rapidoid-cls/src/main/java/org/rapidoid/cls/Cls.java b/rapidoid-cls/src/main/java/org/rapidoid/cls/Cls.java
index 2921528d53..62ee51a54a 100644
--- a/rapidoid-cls/src/main/java/org/rapidoid/cls/Cls.java
+++ b/rapidoid-cls/src/main/java/org/rapidoid/cls/Cls.java
@@ -44,7 +44,7 @@
 import java.util.regex.Pattern;
 
 import org.rapidoid.dates.Dates;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 import org.rapidoid.var.Vars;
 
diff --git a/rapidoid-cls/src/main/java/org/rapidoid/cls/Proxies.java b/rapidoid-cls/src/main/java/org/rapidoid/cls/Proxies.java
index fd2a659451..963625945d 100644
--- a/rapidoid-cls/src/main/java/org/rapidoid/cls/Proxies.java
+++ b/rapidoid-cls/src/main/java/org/rapidoid/cls/Proxies.java
@@ -26,7 +26,7 @@
 import java.util.Arrays;
 
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 public class Proxies {
 
diff --git a/rapidoid-concurrent/src/main/java/org/rapidoid/concurrent/Futures.java b/rapidoid-concurrent/src/main/java/org/rapidoid/concurrent/Futures.java
index b06d0f0984..29cdc1834a 100644
--- a/rapidoid-concurrent/src/main/java/org/rapidoid/concurrent/Futures.java
+++ b/rapidoid-concurrent/src/main/java/org/rapidoid/concurrent/Futures.java
@@ -4,7 +4,7 @@
 
 import org.rapidoid.concurrent.impl.FutureImpl;
 import org.rapidoid.lambda.Mapper;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-concurrent/src/main/java/org/rapidoid/concurrent/impl/FutureImpl.java b/rapidoid-concurrent/src/main/java/org/rapidoid/concurrent/impl/FutureImpl.java
index 7691abf4db..d5f018f16a 100644
--- a/rapidoid-concurrent/src/main/java/org/rapidoid/concurrent/impl/FutureImpl.java
+++ b/rapidoid-concurrent/src/main/java/org/rapidoid/concurrent/impl/FutureImpl.java
@@ -23,7 +23,7 @@
 import java.util.concurrent.TimeoutException;
 
 import org.rapidoid.concurrent.Future;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /**
  * @author Nikolche Mihajlovski
diff --git a/rapidoid-config/src/main/java/org/rapidoid/config/Conf.java b/rapidoid-config/src/main/java/org/rapidoid/config/Conf.java
index 3df0c0a2a3..7e05b0b06b 100644
--- a/rapidoid-config/src/main/java/org/rapidoid/config/Conf.java
+++ b/rapidoid-config/src/main/java/org/rapidoid/config/Conf.java
@@ -5,7 +5,7 @@
 import org.rapidoid.data.YAML;
 import org.rapidoid.io.Res;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-config/src/main/java/org/rapidoid/config/Config.java b/rapidoid-config/src/main/java/org/rapidoid/config/Config.java
index f9331b26c0..c3e9f0c79e 100644
--- a/rapidoid-config/src/main/java/org/rapidoid/config/Config.java
+++ b/rapidoid-config/src/main/java/org/rapidoid/config/Config.java
@@ -25,7 +25,7 @@
 import java.util.Map;
 
 import org.rapidoid.cls.Cls;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /**
  * @author Nikolche Mihajlovski
diff --git a/rapidoid-config/src/test/java/org/rapidoid/config/RefreshingConfigTest.java b/rapidoid-config/src/test/java/org/rapidoid/config/RefreshingConfigTest.java
index b59240c406..8db0315a94 100644
--- a/rapidoid-config/src/test/java/org/rapidoid/config/RefreshingConfigTest.java
+++ b/rapidoid-config/src/test/java/org/rapidoid/config/RefreshingConfigTest.java
@@ -28,7 +28,7 @@
 import org.rapidoid.io.IO;
 import org.rapidoid.log.Log;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.4.0")
diff --git a/rapidoid-crypto/src/main/java/org/rapidoid/crypto/Crypto.java b/rapidoid-crypto/src/main/java/org/rapidoid/crypto/Crypto.java
index 2e928555d3..6c26e10aa2 100644
--- a/rapidoid-crypto/src/main/java/org/rapidoid/crypto/Crypto.java
+++ b/rapidoid-crypto/src/main/java/org/rapidoid/crypto/Crypto.java
@@ -33,7 +33,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.0.0")
diff --git a/rapidoid-crypto/src/test/java/org/rapidoid/crypto/CryptoTest.java b/rapidoid-crypto/src/test/java/org/rapidoid/crypto/CryptoTest.java
index a1b5bd6e89..6bd7d4b23b 100644
--- a/rapidoid-crypto/src/test/java/org/rapidoid/crypto/CryptoTest.java
+++ b/rapidoid-crypto/src/test/java/org/rapidoid/crypto/CryptoTest.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.0.0")
diff --git a/rapidoid-ctx/src/main/java/org/rapidoid/ctx/Roles.java b/rapidoid-ctx/src/main/java/org/rapidoid/ctx/Roles.java
index 7ae1ab4147..76b7623425 100644
--- a/rapidoid-ctx/src/main/java/org/rapidoid/ctx/Roles.java
+++ b/rapidoid-ctx/src/main/java/org/rapidoid/ctx/Roles.java
@@ -11,7 +11,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
 import org.rapidoid.config.Config;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-ctx/src/main/java/org/rapidoid/ctx/UserInfo.java b/rapidoid-ctx/src/main/java/org/rapidoid/ctx/UserInfo.java
index 4d85c52a36..fada59762a 100644
--- a/rapidoid-ctx/src/main/java/org/rapidoid/ctx/UserInfo.java
+++ b/rapidoid-ctx/src/main/java/org/rapidoid/ctx/UserInfo.java
@@ -6,7 +6,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-ctx/src/test/java/org/rapidoid/ctx/RolesTest.java b/rapidoid-ctx/src/test/java/org/rapidoid/ctx/RolesTest.java
index 7a1ed91288..1097d772df 100644
--- a/rapidoid-ctx/src/test/java/org/rapidoid/ctx/RolesTest.java
+++ b/rapidoid-ctx/src/test/java/org/rapidoid/ctx/RolesTest.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.4.0")
diff --git a/rapidoid-dao/src/main/java/org/rapidoid/dao/DAO.java b/rapidoid-dao/src/main/java/org/rapidoid/dao/DAO.java
index 2976d23ec1..55cff8796a 100644
--- a/rapidoid-dao/src/main/java/org/rapidoid/dao/DAO.java
+++ b/rapidoid-dao/src/main/java/org/rapidoid/dao/DAO.java
@@ -4,7 +4,7 @@
 import java.lang.reflect.Type;
 
 import org.rapidoid.plugins.db.DB;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-dates/src/main/java/org/rapidoid/dates/Dates.java b/rapidoid-dates/src/main/java/org/rapidoid/dates/Dates.java
index 690eff5a93..4815f2fd6a 100644
--- a/rapidoid-dates/src/main/java/org/rapidoid/dates/Dates.java
+++ b/rapidoid-dates/src/main/java/org/rapidoid/dates/Dates.java
@@ -26,7 +26,7 @@
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /**
  * @author Nikolche Mihajlovski
diff --git a/rapidoid-db-cassandra/src/main/java/org/rapidoid/plugins/db/cassandra/CassandraDBPlugin.java b/rapidoid-db-cassandra/src/main/java/org/rapidoid/plugins/db/cassandra/CassandraDBPlugin.java
index f7114256f7..8740861b89 100644
--- a/rapidoid-db-cassandra/src/main/java/org/rapidoid/plugins/db/cassandra/CassandraDBPlugin.java
+++ b/rapidoid-db-cassandra/src/main/java/org/rapidoid/plugins/db/cassandra/CassandraDBPlugin.java
@@ -11,7 +11,7 @@
 import org.rapidoid.job.Jobs;
 import org.rapidoid.log.Log;
 import org.rapidoid.plugins.db.DBPluginBase;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Cluster.Builder;
diff --git a/rapidoid-db-cassandra/src/test/java/org/rapidoid/plugins/db/cassandra/CassandraDBPluginTest.java b/rapidoid-db-cassandra/src/test/java/org/rapidoid/plugins/db/cassandra/CassandraDBPluginTest.java
index e31b51355d..7a5e8a69c0 100644
--- a/rapidoid-db-cassandra/src/test/java/org/rapidoid/plugins/db/cassandra/CassandraDBPluginTest.java
+++ b/rapidoid-db-cassandra/src/test/java/org/rapidoid/plugins/db/cassandra/CassandraDBPluginTest.java
@@ -11,7 +11,7 @@
 import org.rapidoid.plugins.Plugins;
 import org.rapidoid.plugins.db.DB;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import com.datastax.driver.core.Session;
 
diff --git a/rapidoid-db-hibernate/src/main/java/org/rapidoid/plugins/db/hibernate/HibernateDBPlugin.java b/rapidoid-db-hibernate/src/main/java/org/rapidoid/plugins/db/hibernate/HibernateDBPlugin.java
index 6b638b01fa..fef9291475 100644
--- a/rapidoid-db-hibernate/src/main/java/org/rapidoid/plugins/db/hibernate/HibernateDBPlugin.java
+++ b/rapidoid-db-hibernate/src/main/java/org/rapidoid/plugins/db/hibernate/HibernateDBPlugin.java
@@ -18,7 +18,7 @@
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.job.Jobs;
 import org.rapidoid.plugins.db.DBPluginBase;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-db-hibernate/src/test/java/org/rapidoid/plugins/db/hibernate/HibernateDBPluginTest.java b/rapidoid-db-hibernate/src/test/java/org/rapidoid/plugins/db/hibernate/HibernateDBPluginTest.java
index 1d5e8869ce..9687ecd306 100644
--- a/rapidoid-db-hibernate/src/test/java/org/rapidoid/plugins/db/hibernate/HibernateDBPluginTest.java
+++ b/rapidoid-db-hibernate/src/test/java/org/rapidoid/plugins/db/hibernate/HibernateDBPluginTest.java
@@ -11,8 +11,8 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.test.TestCommons;
+import org.rapidoid.u.U;
 import org.rapidoid.util.SimplePersistorProvider;
-import org.rapidoid.util.U;
 
 /*
  * #%L
diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/Main.java b/rapidoid-demo/src/main/java/demo/taskplanner/Main.java
index b79eed2a3d..4810ec750d 100644
--- a/rapidoid-demo/src/main/java/demo/taskplanner/Main.java
+++ b/rapidoid-demo/src/main/java/demo/taskplanner/Main.java
@@ -38,7 +38,7 @@
 import org.rapidoid.plugins.db.DB;
 import org.rapidoid.plugins.email.Email;
 import org.rapidoid.plugins.sms.SMS;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import demo.taskplanner.model.Task;
 
diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java
index 5e7f7093c2..f0bed8c433 100644
--- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java
+++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java
@@ -28,7 +28,7 @@
 import org.rapidoid.html.Tag;
 import org.rapidoid.plugins.db.DB;
 import org.rapidoid.security.annotation.CanInsert;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.ButtonWidget;
 
 import demo.taskplanner.model.Task;
diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java
index dc26319a24..ab2f88be55 100644
--- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java
+++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java
@@ -4,7 +4,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.annotation.Web;
 import org.rapidoid.app.GUI;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.LayoutWidget;
 
 /*
diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java
index ce59ebd998..eae5383cb9 100644
--- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java
+++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java
@@ -32,7 +32,7 @@
 import org.rapidoid.html.FieldType;
 import org.rapidoid.html.Tag;
 import org.rapidoid.plugins.db.DB;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 import org.rapidoid.widget.FormWidget;
 import org.rapidoid.widget.GridWidget;
diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java
index 9fbc7333a3..9244c994d9 100644
--- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java
+++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java
@@ -31,7 +31,7 @@
 import org.rapidoid.model.Item;
 import org.rapidoid.model.Items;
 import org.rapidoid.model.Models;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.BootstrapWidgets;
 import org.rapidoid.widget.ButtonWidget;
 import org.rapidoid.widget.GridWidget;
diff --git a/rapidoid-dispatch/src/main/java/org/rapidoid/dispatch/Dispatch.java b/rapidoid-dispatch/src/main/java/org/rapidoid/dispatch/Dispatch.java
index b154b701ea..5f1dcad898 100644
--- a/rapidoid-dispatch/src/main/java/org/rapidoid/dispatch/Dispatch.java
+++ b/rapidoid-dispatch/src/main/java/org/rapidoid/dispatch/Dispatch.java
@@ -26,7 +26,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.dispatch.impl.PojoDispatcherImpl;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-dispatch/src/main/java/org/rapidoid/dispatch/impl/PojoDispatcherImpl.java b/rapidoid-dispatch/src/main/java/org/rapidoid/dispatch/impl/PojoDispatcherImpl.java
index b3b36df373..a3a4bba72d 100644
--- a/rapidoid-dispatch/src/main/java/org/rapidoid/dispatch/impl/PojoDispatcherImpl.java
+++ b/rapidoid-dispatch/src/main/java/org/rapidoid/dispatch/impl/PojoDispatcherImpl.java
@@ -45,8 +45,8 @@
 import org.rapidoid.dispatch.PojoHandlerNotFoundException;
 import org.rapidoid.dispatch.PojoRequest;
 import org.rapidoid.log.Log;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 import org.rapidoid.wire.Wire;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/BasicUtils.java b/rapidoid-html/src/main/java/org/rapidoid/html/BasicUtils.java
index 7d88bca763..6d34ecf2fb 100644
--- a/rapidoid-html/src/main/java/org/rapidoid/html/BasicUtils.java
+++ b/rapidoid-html/src/main/java/org/rapidoid/html/BasicUtils.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/Tags.java b/rapidoid-html/src/main/java/org/rapidoid/html/Tags.java
index 1cfd1d5603..59c107a851 100644
--- a/rapidoid-html/src/main/java/org/rapidoid/html/Tags.java
+++ b/rapidoid-html/src/main/java/org/rapidoid/html/Tags.java
@@ -31,7 +31,7 @@
 import org.rapidoid.html.tag.InputTag;
 import org.rapidoid.html.tag.OptionTag;
 import org.rapidoid.html.tag.TextareaTag;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 import org.rapidoid.var.Vars;
 
diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagImpl.java b/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagImpl.java
index 2d950ba555..a885652ce0 100644
--- a/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagImpl.java
+++ b/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagImpl.java
@@ -31,7 +31,7 @@
 import org.rapidoid.html.Cmd;
 import org.rapidoid.html.Tag;
 import org.rapidoid.html.Tags;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.var.Var;
 
diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagProxy.java b/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagProxy.java
index ccb3180ddd..02b8a1d03f 100644
--- a/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagProxy.java
+++ b/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagProxy.java
@@ -32,7 +32,7 @@
 import org.rapidoid.html.SpecificTag;
 import org.rapidoid.html.Tag;
 import org.rapidoid.html.TagBase;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java b/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java
index 04b2c7876c..7d0093c073 100644
--- a/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java
+++ b/rapidoid-html/src/main/java/org/rapidoid/html/impl/TagRenderer.java
@@ -35,8 +35,8 @@
 import org.rapidoid.html.HTML;
 import org.rapidoid.html.Tag;
 import org.rapidoid.html.TagWidget;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 import org.rapidoid.var.Var;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/impl/UndefinedTag.java b/rapidoid-html/src/main/java/org/rapidoid/html/impl/UndefinedTag.java
index d2521bde11..f987b0dd7b 100644
--- a/rapidoid-html/src/main/java/org/rapidoid/html/impl/UndefinedTag.java
+++ b/rapidoid-html/src/main/java/org/rapidoid/html/impl/UndefinedTag.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.html.Tag;
 import org.rapidoid.html.TagProcessor;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/FastHttp.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/FastHttp.java
index ce1414d97a..7c9c78ea7f 100644
--- a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/FastHttp.java
+++ b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/FastHttp.java
@@ -37,7 +37,7 @@
 import org.rapidoid.net.Protocol;
 import org.rapidoid.net.abstracts.Channel;
 import org.rapidoid.net.impl.RapidoidHelper;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.wire.Wire;
 import org.rapidoid.wrap.BoolWrap;
 
diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpParser.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpParser.java
index 937170686b..41560e3056 100644
--- a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpParser.java
+++ b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpParser.java
@@ -33,8 +33,8 @@
 import org.rapidoid.data.Ranges;
 import org.rapidoid.log.Log;
 import org.rapidoid.net.impl.RapidoidHelper;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 import org.rapidoid.wrap.BoolWrap;
 import org.rapidoid.wrap.IntWrap;
 
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpBuiltins.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpBuiltins.java
index bab7f01847..e6ede6eb1f 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/HttpBuiltins.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/HttpBuiltins.java
@@ -5,8 +5,8 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.ctx.UserInfo;
+import org.rapidoid.u.U;
 import org.rapidoid.util.RapidoidConf;
-import org.rapidoid.util.U;
 import org.rapidoid.webapp.WebApp;
 
 /*
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java
index 76a41b226e..68fa4c841b 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/HttpExchangeImpl.java
@@ -51,9 +51,9 @@
 import org.rapidoid.plugins.templates.ITemplate;
 import org.rapidoid.plugins.templates.Templates;
 import org.rapidoid.security.Secure;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.RapidoidConf;
-import org.rapidoid.util.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.webapp.AppCtx;
 import org.rapidoid.wire.Wire;
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpProtocol.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpProtocol.java
index 9e9b76dece..3b616c9b8e 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/HttpProtocol.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/HttpProtocol.java
@@ -33,7 +33,7 @@
 import org.rapidoid.net.abstracts.Channel;
 import org.rapidoid.net.impl.ExchangeProtocol;
 import org.rapidoid.net.impl.RapidoidConnection;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.util.Usage;
 import org.rapidoid.webapp.AppCtx;
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpResponses.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpResponses.java
index 1b0348e567..d44109e5af 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/HttpResponses.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/HttpResponses.java
@@ -24,7 +24,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpRouter.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpRouter.java
index c137e69dcc..89530c4afb 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/HttpRouter.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/HttpRouter.java
@@ -27,9 +27,9 @@
 import org.rapidoid.bytes.BytesUtil;
 import org.rapidoid.data.Range;
 import org.rapidoid.log.Log;
+import org.rapidoid.u.U;
 import org.rapidoid.util.SimpleHashTable;
 import org.rapidoid.util.SimpleList;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/HttpUpgrades.java b/rapidoid-http/src/main/java/org/rapidoid/http/HttpUpgrades.java
index 0762c70145..f3f827ec17 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/HttpUpgrades.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/HttpUpgrades.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.net.Protocol;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.?")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/PageStack.java b/rapidoid-http/src/main/java/org/rapidoid/http/PageStack.java
index c0ce2c938f..de1e3a0b9d 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/PageStack.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/PageStack.java
@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.0.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/Scopes.java b/rapidoid-http/src/main/java/org/rapidoid/http/Scopes.java
index 92e5c7d387..2bfbd73f88 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/Scopes.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/Scopes.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.0.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/http/session/InMemorySessionStore.java b/rapidoid-http/src/main/java/org/rapidoid/http/session/InMemorySessionStore.java
index ede178a61e..501e80353c 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/http/session/InMemorySessionStore.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/http/session/InMemorySessionStore.java
@@ -6,7 +6,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-http/src/main/java/org/rapidoid/job/ContextPreservingJobWrapper.java b/rapidoid-http/src/main/java/org/rapidoid/job/ContextPreservingJobWrapper.java
index d0cc64fc2d..e648a088b7 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/job/ContextPreservingJobWrapper.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/job/ContextPreservingJobWrapper.java
@@ -25,7 +25,7 @@
 import org.rapidoid.ctx.Ctx;
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/job/Jobs.java b/rapidoid-http/src/main/java/org/rapidoid/job/Jobs.java
index 94d4f8043d..0da9fddbcd 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/job/Jobs.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/job/Jobs.java
@@ -35,8 +35,8 @@
 import org.rapidoid.ctx.Ctx;
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.http.HttpExchange;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/AbstractMenuItem.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/AbstractMenuItem.java
index 0407b9dffd..71dac36d0e 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/AbstractMenuItem.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/AbstractMenuItem.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/AppClasspathEntitiesPlugin.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/AppClasspathEntitiesPlugin.java
index 639810bbdf..96e373ef7e 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/AppClasspathEntitiesPlugin.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/AppClasspathEntitiesPlugin.java
@@ -11,7 +11,7 @@
 import org.rapidoid.cls.Cls;
 import org.rapidoid.entity.IEntity;
 import org.rapidoid.plugins.entities.AbstractEntitiesPlugin;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/AppCtx.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/AppCtx.java
index 2eeb1e018c..28496277ca 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/AppCtx.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/AppCtx.java
@@ -4,7 +4,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.ctx.UserInfo;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/AppMenu.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/AppMenu.java
index c4fd9dd572..945d4200ba 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/AppMenu.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/AppMenu.java
@@ -27,7 +27,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.lambda.Predicate;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/AppMenuItem.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/AppMenuItem.java
index 66d5d0b3cf..2405cfc416 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/AppMenuItem.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/AppMenuItem.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/RootWebApp.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/RootWebApp.java
index 6bc87ec62a..ca87078c7e 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/RootWebApp.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/RootWebApp.java
@@ -8,7 +8,7 @@
 import org.rapidoid.config.Config;
 import org.rapidoid.ctx.Classes;
 import org.rapidoid.scan.ClasspathUtil;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/Scan.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/Scan.java
index 21cc4403a1..971456450f 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/Scan.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/Scan.java
@@ -13,7 +13,7 @@
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.log.Log;
 import org.rapidoid.scan.ClasspathUtil;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebApp.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebApp.java
index fbe6d5c60a..0c8f3d9dc5 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebApp.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebApp.java
@@ -9,7 +9,7 @@
 import org.rapidoid.dispatch.PojoDispatcher;
 import org.rapidoid.http.HttpRouter;
 import org.rapidoid.http.Router;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebAppGroup.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebAppGroup.java
index 70853ebdd3..88242ae2cb 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebAppGroup.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebAppGroup.java
@@ -7,7 +7,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.plugins.Plugins;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebPojoDispatcher.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebPojoDispatcher.java
index 32f70c27ea..9a963fb562 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebPojoDispatcher.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebPojoDispatcher.java
@@ -49,7 +49,7 @@
 import org.rapidoid.http.HttpExchange;
 import org.rapidoid.http.Req;
 import org.rapidoid.http.Resp;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebReq.java b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebReq.java
index e48d1e5967..ee53959ff7 100644
--- a/rapidoid-http/src/main/java/org/rapidoid/webapp/WebReq.java
+++ b/rapidoid-http/src/main/java/org/rapidoid/webapp/WebReq.java
@@ -26,7 +26,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.dispatch.PojoRequest;
 import org.rapidoid.http.HttpExchange;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-http/src/test/java/org/rapidoid/http/HttpMultipartFormTest.java b/rapidoid-http/src/test/java/org/rapidoid/http/HttpMultipartFormTest.java
index c34734442d..54a5736cd4 100644
--- a/rapidoid-http/src/test/java/org/rapidoid/http/HttpMultipartFormTest.java
+++ b/rapidoid-http/src/test/java/org/rapidoid/http/HttpMultipartFormTest.java
@@ -28,7 +28,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.crypto.Crypto;
 import org.rapidoid.io.IO;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-http/src/test/java/org/rapidoid/http/HttpParserTest.java b/rapidoid-http/src/test/java/org/rapidoid/http/HttpParserTest.java
index 2bf85b2f95..6469c1ca17 100644
--- a/rapidoid-http/src/test/java/org/rapidoid/http/HttpParserTest.java
+++ b/rapidoid-http/src/test/java/org/rapidoid/http/HttpParserTest.java
@@ -28,7 +28,7 @@
 import org.rapidoid.http.fast.HttpParser;
 import org.rapidoid.net.abstracts.Channel;
 import org.rapidoid.net.impl.RapidoidHelper;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-http/src/test/java/org/rapidoid/http/HttpServerSubAppTest.java b/rapidoid-http/src/test/java/org/rapidoid/http/HttpServerSubAppTest.java
index cd8934224c..133346f00b 100644
--- a/rapidoid-http/src/test/java/org/rapidoid/http/HttpServerSubAppTest.java
+++ b/rapidoid-http/src/test/java/org/rapidoid/http/HttpServerSubAppTest.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.AppCtx;
 import org.rapidoid.webapp.WebApp;
 import org.rapidoid.webapp.WebAppGroup;
diff --git a/rapidoid-http/src/test/java/org/rapidoid/http/HttpTestCommons.java b/rapidoid-http/src/test/java/org/rapidoid/http/HttpTestCommons.java
index cbc5eb4c64..f4cd54aef9 100644
--- a/rapidoid-http/src/test/java/org/rapidoid/http/HttpTestCommons.java
+++ b/rapidoid-http/src/test/java/org/rapidoid/http/HttpTestCommons.java
@@ -41,7 +41,7 @@
 import org.rapidoid.io.IO;
 import org.rapidoid.log.Log;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.WebApp;
 import org.rapidoid.webapp.WebAppGroup;
 
diff --git a/rapidoid-insights/src/main/java/org/rapidoid/Insights.java b/rapidoid-insights/src/main/java/org/rapidoid/Insights.java
index 0023617fbf..abaf262b98 100644
--- a/rapidoid-insights/src/main/java/org/rapidoid/Insights.java
+++ b/rapidoid-insights/src/main/java/org/rapidoid/Insights.java
@@ -6,7 +6,7 @@
 
 import org.rapidoid.measure.Measure;
 import org.rapidoid.measure.StatsMeasure;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-insights/src/main/java/org/rapidoid/InsightsThread.java b/rapidoid-insights/src/main/java/org/rapidoid/InsightsThread.java
index 205e01a5ea..56037bdaa9 100644
--- a/rapidoid-insights/src/main/java/org/rapidoid/InsightsThread.java
+++ b/rapidoid-insights/src/main/java/org/rapidoid/InsightsThread.java
@@ -1,7 +1,7 @@
 package org.rapidoid;
 
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/test/JDBCPoolC3P0Test.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/test/JDBCPoolC3P0Test.java
index 28c9c2b570..89775b7066 100644
--- a/rapidoid-integration-tests/src/test/java/org/rapidoid/test/JDBCPoolC3P0Test.java
+++ b/rapidoid-integration-tests/src/test/java/org/rapidoid/test/JDBCPoolC3P0Test.java
@@ -28,7 +28,7 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.sql.C3P0ConnectionPool;
 import org.rapidoid.sql.SQL;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/test/MicroServicesTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/test/MicroServicesTest.java
index e574871dd2..577cc401bf 100644
--- a/rapidoid-integration-tests/src/test/java/org/rapidoid/test/MicroServicesTest.java
+++ b/rapidoid-integration-tests/src/test/java/org/rapidoid/test/MicroServicesTest.java
@@ -34,7 +34,7 @@
 import org.rapidoid.http.HttpExchange;
 import org.rapidoid.http.REST;
 import org.rapidoid.http.WebServer;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.webapp.WebApp;
 import org.rapidoid.webapp.WebAppGroup;
diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/test/MustacheTemplatesTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/test/MustacheTemplatesTest.java
index 5b63f5571b..d9843005d3 100644
--- a/rapidoid-integration-tests/src/test/java/org/rapidoid/test/MustacheTemplatesTest.java
+++ b/rapidoid-integration-tests/src/test/java/org/rapidoid/test/MustacheTemplatesTest.java
@@ -27,7 +27,7 @@
 import org.rapidoid.plugins.templates.ITemplate;
 import org.rapidoid.plugins.templates.MustacheTemplatesPlugin;
 import org.rapidoid.plugins.templates.Templates;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-io/src/main/java/org/rapidoid/io/CustomizableClassLoader.java b/rapidoid-io/src/main/java/org/rapidoid/io/CustomizableClassLoader.java
index f54a6ba0d6..d8cd0fdeae 100644
--- a/rapidoid-io/src/main/java/org/rapidoid/io/CustomizableClassLoader.java
+++ b/rapidoid-io/src/main/java/org/rapidoid/io/CustomizableClassLoader.java
@@ -28,7 +28,7 @@
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.lambda.Predicate;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-io/src/main/java/org/rapidoid/io/IO.java b/rapidoid-io/src/main/java/org/rapidoid/io/IO.java
index 25f5c70ba2..05e95db2c8 100644
--- a/rapidoid-io/src/main/java/org/rapidoid/io/IO.java
+++ b/rapidoid-io/src/main/java/org/rapidoid/io/IO.java
@@ -40,7 +40,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-io/src/main/java/org/rapidoid/io/Res.java b/rapidoid-io/src/main/java/org/rapidoid/io/Res.java
index 41bd1e38a8..e2a809d18c 100644
--- a/rapidoid-io/src/main/java/org/rapidoid/io/Res.java
+++ b/rapidoid-io/src/main/java/org/rapidoid/io/Res.java
@@ -13,7 +13,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-jackson/src/test/java/org/rapidoid/data/User.java b/rapidoid-jackson/src/test/java/org/rapidoid/data/User.java
index 4b099245fb..151669a469 100644
--- a/rapidoid-jackson/src/test/java/org/rapidoid/data/User.java
+++ b/rapidoid-jackson/src/test/java/org/rapidoid/data/User.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @SuppressWarnings("unchecked")
 /**
diff --git a/rapidoid-jackson/src/test/java/org/rapidoid/data/YAMLTest.java b/rapidoid-jackson/src/test/java/org/rapidoid/data/YAMLTest.java
index 9a29fc003c..d69ecdf5c4 100644
--- a/rapidoid-jackson/src/test/java/org/rapidoid/data/YAMLTest.java
+++ b/rapidoid-jackson/src/test/java/org/rapidoid/data/YAMLTest.java
@@ -27,7 +27,7 @@
 import org.rapidoid.data.YAML;
 import org.rapidoid.io.IO;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 
diff --git a/rapidoid-lambda/src/main/java/org/rapidoid/lambda/Lambdas.java b/rapidoid-lambda/src/main/java/org/rapidoid/lambda/Lambdas.java
index 589a9247cb..5380cbb879 100644
--- a/rapidoid-lambda/src/main/java/org/rapidoid/lambda/Lambdas.java
+++ b/rapidoid-lambda/src/main/java/org/rapidoid/lambda/Lambdas.java
@@ -3,7 +3,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java b/rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java
index 7901d4364b..8b730c8b45 100644
--- a/rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java
+++ b/rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java
@@ -32,7 +32,7 @@
 import org.rapidoid.log.Log;
 import org.rapidoid.plugins.Plugin;
 import org.rapidoid.plugins.Plugins;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.AppMenu;
 import org.rapidoid.webapp.RootWebApp;
 import org.rapidoid.webapp.WebApp;
diff --git a/rapidoid-main/src/main/java/org/rapidoid/main/MainHelp.java b/rapidoid-main/src/main/java/org/rapidoid/main/MainHelp.java
index 5c5c2b5415..2c62bed2a1 100644
--- a/rapidoid-main/src/main/java/org/rapidoid/main/MainHelp.java
+++ b/rapidoid-main/src/main/java/org/rapidoid/main/MainHelp.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.0.0")
diff --git a/rapidoid-model/src/main/java/org/rapidoid/model/Models.java b/rapidoid-model/src/main/java/org/rapidoid/model/Models.java
index f6fac6080c..4ec056c927 100644
--- a/rapidoid-model/src/main/java/org/rapidoid/model/Models.java
+++ b/rapidoid-model/src/main/java/org/rapidoid/model/Models.java
@@ -39,7 +39,7 @@
 import org.rapidoid.model.impl.ItemPropertyVar;
 import org.rapidoid.model.impl.ListItems;
 import org.rapidoid.model.impl.MapItem;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.var.Var;
 
diff --git a/rapidoid-model/src/main/java/org/rapidoid/model/impl/AbstractModel.java b/rapidoid-model/src/main/java/org/rapidoid/model/impl/AbstractModel.java
index 0fc15d1fb1..e118716a4b 100644
--- a/rapidoid-model/src/main/java/org/rapidoid/model/impl/AbstractModel.java
+++ b/rapidoid-model/src/main/java/org/rapidoid/model/impl/AbstractModel.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.model.IModel;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 import org.rapidoid.var.Vars;
 
diff --git a/rapidoid-model/src/main/java/org/rapidoid/model/impl/BeanListItems.java b/rapidoid-model/src/main/java/org/rapidoid/model/impl/BeanListItems.java
index c1459835c7..ef3e52565d 100644
--- a/rapidoid-model/src/main/java/org/rapidoid/model/impl/BeanListItems.java
+++ b/rapidoid-model/src/main/java/org/rapidoid/model/impl/BeanListItems.java
@@ -29,7 +29,7 @@
 import org.rapidoid.model.Item;
 import org.rapidoid.model.Models;
 import org.rapidoid.model.Property;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-model/src/main/java/org/rapidoid/model/impl/DbItems.java b/rapidoid-model/src/main/java/org/rapidoid/model/impl/DbItems.java
index 221a4f526c..95aa2b723b 100644
--- a/rapidoid-model/src/main/java/org/rapidoid/model/impl/DbItems.java
+++ b/rapidoid-model/src/main/java/org/rapidoid/model/impl/DbItems.java
@@ -31,7 +31,7 @@
 import org.rapidoid.model.Items;
 import org.rapidoid.model.Models;
 import org.rapidoid.plugins.db.DB;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @SuppressWarnings("serial")
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-model/src/main/java/org/rapidoid/model/impl/ListItems.java b/rapidoid-model/src/main/java/org/rapidoid/model/impl/ListItems.java
index 2c07cecd7e..ff8bf024a5 100644
--- a/rapidoid-model/src/main/java/org/rapidoid/model/impl/ListItems.java
+++ b/rapidoid-model/src/main/java/org/rapidoid/model/impl/ListItems.java
@@ -30,7 +30,7 @@
 import org.rapidoid.model.Item;
 import org.rapidoid.model.Items;
 import org.rapidoid.model.Property;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/AbstractLoop.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/AbstractLoop.java
index 9137c24289..5a3d21b1e7 100644
--- a/rapidoid-net/src/main/java/org/rapidoid/net/impl/AbstractLoop.java
+++ b/rapidoid-net/src/main/java/org/rapidoid/net/impl/AbstractLoop.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/DefaultExchange.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/DefaultExchange.java
index 7f640f853e..8210e1ed97 100644
--- a/rapidoid-net/src/main/java/org/rapidoid/net/impl/DefaultExchange.java
+++ b/rapidoid-net/src/main/java/org/rapidoid/net/impl/DefaultExchange.java
@@ -36,9 +36,9 @@
 import org.rapidoid.data.Range;
 import org.rapidoid.net.abstracts.Channel;
 import org.rapidoid.net.abstracts.ProtocolContext;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.Resetable;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidChannel.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidChannel.java
index 0a08d06df7..c9f2f1df9b 100644
--- a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidChannel.java
+++ b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidChannel.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.net.Protocol;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidConnection.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidConnection.java
index 363fc1ba9a..ec22d44011 100644
--- a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidConnection.java
+++ b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidConnection.java
@@ -38,9 +38,9 @@
 import org.rapidoid.data.JSON;
 import org.rapidoid.net.Protocol;
 import org.rapidoid.net.abstracts.Channel;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.Resetable;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidServerLoop.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidServerLoop.java
index 16bbbdbe02..909e83d609 100644
--- a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidServerLoop.java
+++ b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidServerLoop.java
@@ -39,8 +39,8 @@
 import org.rapidoid.net.Protocol;
 import org.rapidoid.net.TCPServer;
 import org.rapidoid.net.TCPServerInfo;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Rnd;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorker.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorker.java
index 067275643e..6644373c3c 100644
--- a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorker.java
+++ b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorker.java
@@ -40,8 +40,8 @@
 import org.rapidoid.net.Protocol;
 import org.rapidoid.pool.Pool;
 import org.rapidoid.pool.Pools;
+import org.rapidoid.u.U;
 import org.rapidoid.util.SimpleList;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorkerThread.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorkerThread.java
index 8c0a981553..801f523425 100644
--- a/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorkerThread.java
+++ b/rapidoid-net/src/main/java/org/rapidoid/net/impl/RapidoidWorkerThread.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.net.Protocol;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.wire.Wire;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-net/src/test/java/org/rapidoid/NetTestCommons.java b/rapidoid-net/src/test/java/org/rapidoid/NetTestCommons.java
index b86cfd3a0b..d66c766dcf 100644
--- a/rapidoid-net/src/test/java/org/rapidoid/NetTestCommons.java
+++ b/rapidoid-net/src/test/java/org/rapidoid/NetTestCommons.java
@@ -27,7 +27,7 @@
 import org.rapidoid.net.Serve;
 import org.rapidoid.net.TCPServer;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuth.java b/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuth.java
index 0858940288..a22cb2c08c 100644
--- a/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuth.java
+++ b/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuth.java
@@ -29,7 +29,7 @@
 import org.rapidoid.http.Handler;
 import org.rapidoid.http.HttpExchange;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.AppCtx;
 import org.rapidoid.webapp.WebApp;
 
diff --git a/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuthTokenHandler.java b/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuthTokenHandler.java
index abe3a5caf3..064ed5e94a 100644
--- a/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuthTokenHandler.java
+++ b/rapidoid-oauth/src/main/java/org/rapidoid/oauth/OAuthTokenHandler.java
@@ -40,7 +40,7 @@
 import org.rapidoid.http.Handler;
 import org.rapidoid.http.HttpExchange;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/AbstractPlugin.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/AbstractPlugin.java
index de3c86809b..41c1ea6143 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/AbstractPlugin.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/AbstractPlugin.java
@@ -26,7 +26,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/PlainTemplate.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/PlainTemplate.java
index 42a27585fc..3cf7985091 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/PlainTemplate.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/PlainTemplate.java
@@ -27,7 +27,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
 import org.rapidoid.plugins.templates.ITemplate;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/Plugins.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/Plugins.java
index cd93b2b0fb..d8ecd6153a 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/Plugins.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/Plugins.java
@@ -25,7 +25,7 @@
 import org.rapidoid.plugins.templates.TemplatesPlugin;
 import org.rapidoid.plugins.users.DefaultUsersPlugin;
 import org.rapidoid.plugins.users.UsersPlugin;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/cache/AbstractCache.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/cache/AbstractCache.java
index a71095bffc..2cbd4d542d 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/cache/AbstractCache.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/cache/AbstractCache.java
@@ -26,7 +26,7 @@
 import org.rapidoid.concurrent.Future;
 import org.rapidoid.concurrent.Promise;
 import org.rapidoid.concurrent.Promises;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/db/DB.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/db/DB.java
index 9260b0a316..b56c512ec0 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/db/DB.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/db/DB.java
@@ -30,7 +30,7 @@
 import org.rapidoid.lambda.Operation;
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.plugins.Plugins;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/db/DBPluginBase.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/db/DBPluginBase.java
index 9a98ee8adf..41063799c1 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/db/DBPluginBase.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/db/DBPluginBase.java
@@ -20,7 +20,7 @@
 import org.rapidoid.lambda.Operation;
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.plugins.entities.Entities;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/email/DefaultEmailPlugin.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/email/DefaultEmailPlugin.java
index 1fbd912fb4..952236389e 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/email/DefaultEmailPlugin.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/email/DefaultEmailPlugin.java
@@ -5,8 +5,8 @@
 import org.rapidoid.concurrent.Callback;
 import org.rapidoid.concurrent.Callbacks;
 import org.rapidoid.log.Log;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 
 /*
  * #%L
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/email/Email.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/email/Email.java
index d0b8b51c9d..ad90638aac 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/email/Email.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/email/Email.java
@@ -4,7 +4,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.concurrent.Callback;
 import org.rapidoid.plugins.Plugins;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/sms/DefaultSMSPlugin.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/sms/DefaultSMSPlugin.java
index eb8ca36e8e..228cbfd043 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/sms/DefaultSMSPlugin.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/sms/DefaultSMSPlugin.java
@@ -5,8 +5,8 @@
 import org.rapidoid.concurrent.Callback;
 import org.rapidoid.concurrent.Callbacks;
 import org.rapidoid.log.Log;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 
 /*
  * #%L
diff --git a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/sms/SMS.java b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/sms/SMS.java
index 8e08091cce..195bcd1381 100644
--- a/rapidoid-plugins/src/main/java/org/rapidoid/plugins/sms/SMS.java
+++ b/rapidoid-plugins/src/main/java/org/rapidoid/plugins/sms/SMS.java
@@ -4,7 +4,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.concurrent.Callback;
 import org.rapidoid.plugins.Plugins;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-plugins/src/test/java/org/rapidoid/plugins/cache/CacheTest.java b/rapidoid-plugins/src/test/java/org/rapidoid/plugins/cache/CacheTest.java
index a91b5402bf..cf8a22d83f 100644
--- a/rapidoid-plugins/src/test/java/org/rapidoid/plugins/cache/CacheTest.java
+++ b/rapidoid-plugins/src/test/java/org/rapidoid/plugins/cache/CacheTest.java
@@ -28,7 +28,7 @@
 import org.rapidoid.concurrent.Callback;
 import org.rapidoid.concurrent.Future;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-pool/src/main/java/org/rapidoid/pool/ArrayPool.java b/rapidoid-pool/src/main/java/org/rapidoid/pool/ArrayPool.java
index 60a8c91416..ca1b0a56cf 100644
--- a/rapidoid-pool/src/main/java/org/rapidoid/pool/ArrayPool.java
+++ b/rapidoid-pool/src/main/java/org/rapidoid/pool/ArrayPool.java
@@ -25,7 +25,7 @@
 import org.rapidoid.AbstractInsightful;
 import org.rapidoid.arr.Arr;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /**
  * @author Nikolche Mihajlovski
diff --git a/rapidoid-quick/src/main/java/org/rapidoid/quick/Quick.java b/rapidoid-quick/src/main/java/org/rapidoid/quick/Quick.java
index 502f369e10..7ddb210cc5 100644
--- a/rapidoid-quick/src/main/java/org/rapidoid/quick/Quick.java
+++ b/rapidoid-quick/src/main/java/org/rapidoid/quick/Quick.java
@@ -48,7 +48,7 @@
 import org.rapidoid.security.annotation.Moderator;
 import org.rapidoid.security.annotation.Role;
 import org.rapidoid.security.annotation.HasRole;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.WebApp;
 import org.rapidoid.webapp.WebAppGroup;
 
diff --git a/rapidoid-quick/src/main/java/org/rapidoid/quick/QuickJPA.java b/rapidoid-quick/src/main/java/org/rapidoid/quick/QuickJPA.java
index c4af256919..83984ef2f7 100644
--- a/rapidoid-quick/src/main/java/org/rapidoid/quick/QuickJPA.java
+++ b/rapidoid-quick/src/main/java/org/rapidoid/quick/QuickJPA.java
@@ -36,7 +36,7 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.ctx.PersisterProvider;
 import org.rapidoid.io.IO;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.Scan;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-rest/src/main/java/org/rapidoid/http/DynamicRESTClient.java b/rapidoid-rest/src/main/java/org/rapidoid/http/DynamicRESTClient.java
index dcd458363c..cedda59b11 100644
--- a/rapidoid-rest/src/main/java/org/rapidoid/http/DynamicRESTClient.java
+++ b/rapidoid-rest/src/main/java/org/rapidoid/http/DynamicRESTClient.java
@@ -33,7 +33,7 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.config.Config;
 import org.rapidoid.lambda.Dynamic;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.4.0")
diff --git a/rapidoid-rest/src/main/java/org/rapidoid/http/HttpClient.java b/rapidoid-rest/src/main/java/org/rapidoid/http/HttpClient.java
index 7d64e4cb95..bd34f3f98d 100644
--- a/rapidoid-rest/src/main/java/org/rapidoid/http/HttpClient.java
+++ b/rapidoid-rest/src/main/java/org/rapidoid/http/HttpClient.java
@@ -49,7 +49,7 @@
 import org.rapidoid.concurrent.Promises;
 import org.rapidoid.io.IO;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-rest/src/main/java/org/rapidoid/http/REST.java b/rapidoid-rest/src/main/java/org/rapidoid/http/REST.java
index c5fb98b96d..13c67a94c4 100644
--- a/rapidoid-rest/src/main/java/org/rapidoid/http/REST.java
+++ b/rapidoid-rest/src/main/java/org/rapidoid/http/REST.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.concurrent.Callback;
 import org.rapidoid.concurrent.Future;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-rest/src/test/java/org/rapidoid/http/DynamicClientTest.java b/rapidoid-rest/src/test/java/org/rapidoid/http/DynamicClientTest.java
index 3dc54bcc88..aee7f5a133 100644
--- a/rapidoid-rest/src/test/java/org/rapidoid/http/DynamicClientTest.java
+++ b/rapidoid-rest/src/test/java/org/rapidoid/http/DynamicClientTest.java
@@ -30,7 +30,7 @@
 import org.rapidoid.http.fast.On;
 import org.rapidoid.http.fast.ParamHandler;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.4.0")
diff --git a/rapidoid-rql/src/main/java/org/rapidoid/rql/RQL.java b/rapidoid-rql/src/main/java/org/rapidoid/rql/RQL.java
index c4a744330b..ffe64cc8c9 100644
--- a/rapidoid-rql/src/main/java/org/rapidoid/rql/RQL.java
+++ b/rapidoid-rql/src/main/java/org/rapidoid/rql/RQL.java
@@ -26,7 +26,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.plugins.db.DB;
 import org.rapidoid.plugins.entities.Entities;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.0.0")
diff --git a/rapidoid-scan/src/main/java/org/rapidoid/scan/ClasspathUtil.java b/rapidoid-scan/src/main/java/org/rapidoid/scan/ClasspathUtil.java
index 8d271b70ab..b85c14d929 100644
--- a/rapidoid-scan/src/main/java/org/rapidoid/scan/ClasspathUtil.java
+++ b/rapidoid-scan/src/main/java/org/rapidoid/scan/ClasspathUtil.java
@@ -26,7 +26,7 @@
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-scan/src/test/java/custom/rapidoid/scan/ClasspathScanTest.java b/rapidoid-scan/src/test/java/custom/rapidoid/scan/ClasspathScanTest.java
index b4650b38fe..77a38b7fc8 100644
--- a/rapidoid-scan/src/test/java/custom/rapidoid/scan/ClasspathScanTest.java
+++ b/rapidoid-scan/src/test/java/custom/rapidoid/scan/ClasspathScanTest.java
@@ -8,7 +8,7 @@
 import org.rapidoid.cls.Cls;
 import org.rapidoid.scan.ClasspathUtil;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import cccccc.Ccccc;
 
diff --git a/rapidoid-security/src/main/java/org/rapidoid/security/AppSecurity.java b/rapidoid-security/src/main/java/org/rapidoid/security/AppSecurity.java
index 84a01d7c24..fe09ed52ae 100644
--- a/rapidoid-security/src/main/java/org/rapidoid/security/AppSecurity.java
+++ b/rapidoid-security/src/main/java/org/rapidoid/security/AppSecurity.java
@@ -39,8 +39,8 @@
 import org.rapidoid.security.annotation.Manager;
 import org.rapidoid.security.annotation.Moderator;
 import org.rapidoid.security.annotation.Role;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-security/src/main/java/org/rapidoid/security/Secure.java b/rapidoid-security/src/main/java/org/rapidoid/security/Secure.java
index f87e5e4ee5..2d02f4a5b2 100644
--- a/rapidoid-security/src/main/java/org/rapidoid/security/Secure.java
+++ b/rapidoid-security/src/main/java/org/rapidoid/security/Secure.java
@@ -35,8 +35,8 @@
 import org.rapidoid.security.annotation.CanInsert;
 import org.rapidoid.security.annotation.CanManage;
 import org.rapidoid.security.annotation.CanRead;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-security/src/test/java/org/rapidoid/security/DataPermissionsTest.java b/rapidoid-security/src/test/java/org/rapidoid/security/DataPermissionsTest.java
index 5a2a0a1198..eeee8fc5e3 100644
--- a/rapidoid-security/src/test/java/org/rapidoid/security/DataPermissionsTest.java
+++ b/rapidoid-security/src/test/java/org/rapidoid/security/DataPermissionsTest.java
@@ -35,7 +35,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.security.annotation.CanChange;
 import org.rapidoid.security.annotation.CanRead;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @CanRead({ ANYBODY })
 @CanChange({ ANYBODY })
diff --git a/rapidoid-security/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java b/rapidoid-security/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java
index cd97bfc6e1..5f7f4db00d 100644
--- a/rapidoid-security/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java
+++ b/rapidoid-security/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java
@@ -29,7 +29,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 class Foo {
 	public String createdBy;
diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/C3P0ConnectionPool.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/C3P0ConnectionPool.java
index 5696d649a5..fac4e5f491 100644
--- a/rapidoid-sql/src/main/java/org/rapidoid/sql/C3P0ConnectionPool.java
+++ b/rapidoid-sql/src/main/java/org/rapidoid/sql/C3P0ConnectionPool.java
@@ -26,7 +26,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/JDBCConfig.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/JDBCConfig.java
index e79f0feebb..0b76bbbab0 100644
--- a/rapidoid-sql/src/main/java/org/rapidoid/sql/JDBCConfig.java
+++ b/rapidoid-sql/src/main/java/org/rapidoid/sql/JDBCConfig.java
@@ -23,7 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/SQL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/SQL.java
index c8a7e8687f..7e7eea644d 100644
--- a/rapidoid-sql/src/main/java/org/rapidoid/sql/SQL.java
+++ b/rapidoid-sql/src/main/java/org/rapidoid/sql/SQL.java
@@ -33,7 +33,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/SQLAPI.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/SQLAPI.java
index bac55f1631..c9c1d84ada 100644
--- a/rapidoid-sql/src/main/java/org/rapidoid/sql/SQLAPI.java
+++ b/rapidoid-sql/src/main/java/org/rapidoid/sql/SQLAPI.java
@@ -31,7 +31,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-sql/src/test/java/org/rapidoid/sql/SQLTest.java b/rapidoid-sql/src/test/java/org/rapidoid/sql/SQLTest.java
index 67f2d90e49..64a0fa8926 100644
--- a/rapidoid-sql/src/test/java/org/rapidoid/sql/SQLTest.java
+++ b/rapidoid-sql/src/test/java/org/rapidoid/sql/SQLTest.java
@@ -25,7 +25,7 @@
 
 import org.junit.Test;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 
 import com.mysql.jdbc.exceptions.jdbc4.CommunicationsException;
diff --git a/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/MustacheFileTemplate.java b/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/MustacheFileTemplate.java
index 21293c11a5..41c548a1d7 100644
--- a/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/MustacheFileTemplate.java
+++ b/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/MustacheFileTemplate.java
@@ -26,7 +26,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import com.github.mustachejava.Mustache;
 import com.github.mustachejava.MustacheFactory;
diff --git a/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/MustacheStringTemplate.java b/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/MustacheStringTemplate.java
index d227e95fb6..caa6cc8e11 100644
--- a/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/MustacheStringTemplate.java
+++ b/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/MustacheStringTemplate.java
@@ -27,7 +27,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import com.github.mustachejava.Mustache;
 import com.github.mustachejava.MustacheFactory;
diff --git a/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/RapidoidMustacheFactory.java b/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/RapidoidMustacheFactory.java
index 4410bd2a15..92991d3510 100644
--- a/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/RapidoidMustacheFactory.java
+++ b/rapidoid-templates-mustache/src/main/java/org/rapidoid/plugins/templates/RapidoidMustacheFactory.java
@@ -33,7 +33,7 @@
 import org.rapidoid.io.Res;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import com.github.mustachejava.DefaultMustacheFactory;
 import com.github.mustachejava.DefaultMustacheVisitor;
diff --git a/rapidoid-templates-mustache/src/test/java/org/rapidoid/plugins/templates/MustacheTemplatesTest.java b/rapidoid-templates-mustache/src/test/java/org/rapidoid/plugins/templates/MustacheTemplatesTest.java
index bbecbe887c..8763e3d6a6 100644
--- a/rapidoid-templates-mustache/src/test/java/org/rapidoid/plugins/templates/MustacheTemplatesTest.java
+++ b/rapidoid-templates-mustache/src/test/java/org/rapidoid/plugins/templates/MustacheTemplatesTest.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.plugins.Plugins;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import com.github.mustachejava.MustacheFactory;
 
diff --git a/rapidoid-u/src/main/java/org/rapidoid/util/Is.java b/rapidoid-u/src/main/java/org/rapidoid/u/Is.java
similarity index 97%
rename from rapidoid-u/src/main/java/org/rapidoid/util/Is.java
rename to rapidoid-u/src/main/java/org/rapidoid/u/Is.java
index 22d42d7378..fbe9bd8ee0 100644
--- a/rapidoid-u/src/main/java/org/rapidoid/util/Is.java
+++ b/rapidoid-u/src/main/java/org/rapidoid/u/Is.java
@@ -1,4 +1,4 @@
-package org.rapidoid.util;
+package org.rapidoid.u;
 
 /*
  * #%L
diff --git a/rapidoid-u/src/main/java/org/rapidoid/util/U.java b/rapidoid-u/src/main/java/org/rapidoid/u/U.java
similarity index 99%
rename from rapidoid-u/src/main/java/org/rapidoid/util/U.java
rename to rapidoid-u/src/main/java/org/rapidoid/u/U.java
index 443bb266a9..d7da77252f 100644
--- a/rapidoid-u/src/main/java/org/rapidoid/util/U.java
+++ b/rapidoid-u/src/main/java/org/rapidoid/u/U.java
@@ -1,4 +1,4 @@
-package org.rapidoid.util;
+package org.rapidoid.u;
 
 /*
  * #%L
diff --git a/rapidoid-u/src/test/java/org/rapidoid/util/EgInterface.java b/rapidoid-u/src/test/java/org/rapidoid/u/EgInterface.java
similarity index 96%
rename from rapidoid-u/src/test/java/org/rapidoid/util/EgInterface.java
rename to rapidoid-u/src/test/java/org/rapidoid/u/EgInterface.java
index f4b5caa86b..31e053dd8f 100644
--- a/rapidoid-u/src/test/java/org/rapidoid/util/EgInterface.java
+++ b/rapidoid-u/src/test/java/org/rapidoid/u/EgInterface.java
@@ -1,4 +1,4 @@
-package org.rapidoid.util;
+package org.rapidoid.u;
 
 /*
  * #%L
diff --git a/rapidoid-u/src/test/java/org/rapidoid/util/UTest.java b/rapidoid-u/src/test/java/org/rapidoid/u/UTest.java
similarity index 99%
rename from rapidoid-u/src/test/java/org/rapidoid/util/UTest.java
rename to rapidoid-u/src/test/java/org/rapidoid/u/UTest.java
index a947044b3d..5e989bfd6b 100644
--- a/rapidoid-u/src/test/java/org/rapidoid/util/UTest.java
+++ b/rapidoid-u/src/test/java/org/rapidoid/u/UTest.java
@@ -1,4 +1,4 @@
-package org.rapidoid.util;
+package org.rapidoid.u;
 
 /*
  * #%L
@@ -36,6 +36,7 @@
 import org.junit.Test;
 import org.rapidoid.lambda.Dynamic;
 import org.rapidoid.test.TestCommons;
+import org.rapidoid.u.U;
 
 /**
  * @author Nikolche Mihajlovski
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/lambda/ResultCounterCallback.java b/rapidoid-utils/src/main/java/org/rapidoid/lambda/ResultCounterCallback.java
index b19b0b335f..c3a6e32e94 100644
--- a/rapidoid-utils/src/main/java/org/rapidoid/lambda/ResultCounterCallback.java
+++ b/rapidoid-utils/src/main/java/org/rapidoid/lambda/ResultCounterCallback.java
@@ -7,7 +7,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.concurrent.Callback;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/mime/MediaType.java b/rapidoid-utils/src/main/java/org/rapidoid/mime/MediaType.java
index 80530bf7d9..9fd0edd72f 100644
--- a/rapidoid-utils/src/main/java/org/rapidoid/mime/MediaType.java
+++ b/rapidoid-utils/src/main/java/org/rapidoid/mime/MediaType.java
@@ -4,7 +4,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/util/D.java b/rapidoid-utils/src/main/java/org/rapidoid/util/D.java
index feb839580d..e1338cc4ef 100644
--- a/rapidoid-utils/src/main/java/org/rapidoid/util/D.java
+++ b/rapidoid-utils/src/main/java/org/rapidoid/util/D.java
@@ -5,6 +5,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/util/English.java b/rapidoid-utils/src/main/java/org/rapidoid/util/English.java
index bed476cfcc..2a06dc91f1 100644
--- a/rapidoid-utils/src/main/java/org/rapidoid/util/English.java
+++ b/rapidoid-utils/src/main/java/org/rapidoid/util/English.java
@@ -26,6 +26,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.io.IO;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/util/RapidoidProcess.java b/rapidoid-utils/src/main/java/org/rapidoid/util/RapidoidProcess.java
index 78ac60bf6c..f644c5482b 100644
--- a/rapidoid-utils/src/main/java/org/rapidoid/util/RapidoidProcess.java
+++ b/rapidoid-utils/src/main/java/org/rapidoid/util/RapidoidProcess.java
@@ -29,6 +29,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java b/rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java
index 594de5516f..39c19dabec 100644
--- a/rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java
+++ b/rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java
@@ -65,6 +65,7 @@
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.log.Log;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/util/Usage.java b/rapidoid-utils/src/main/java/org/rapidoid/util/Usage.java
index 34ec6b09aa..768d0bf31e 100644
--- a/rapidoid-utils/src/main/java/org/rapidoid/util/Usage.java
+++ b/rapidoid-utils/src/main/java/org/rapidoid/util/Usage.java
@@ -22,6 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.2.0")
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/util/Val.java b/rapidoid-utils/src/main/java/org/rapidoid/util/Val.java
index 9bb38bb993..bb57cccb70 100644
--- a/rapidoid-utils/src/main/java/org/rapidoid/util/Val.java
+++ b/rapidoid-utils/src/main/java/org/rapidoid/util/Val.java
@@ -2,6 +2,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-var/src/main/java/org/rapidoid/var/impl/AbstractVar.java b/rapidoid-var/src/main/java/org/rapidoid/var/impl/AbstractVar.java
index 92b77879e3..7a4f692ac7 100644
--- a/rapidoid-var/src/main/java/org/rapidoid/var/impl/AbstractVar.java
+++ b/rapidoid-var/src/main/java/org/rapidoid/var/impl/AbstractVar.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-var/src/main/java/org/rapidoid/var/impl/MandatoryVar.java b/rapidoid-var/src/main/java/org/rapidoid/var/impl/MandatoryVar.java
index 84a6afa952..65b3de77c8 100644
--- a/rapidoid-var/src/main/java/org/rapidoid/var/impl/MandatoryVar.java
+++ b/rapidoid-var/src/main/java/org/rapidoid/var/impl/MandatoryVar.java
@@ -2,7 +2,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 
 /*
diff --git a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Dir.java b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Dir.java
index 3cdc342194..e7357e0b26 100644
--- a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Dir.java
+++ b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Dir.java
@@ -20,7 +20,7 @@
 import org.rapidoid.io.Res;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Reload.java b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Reload.java
index 7e367da23d..14c6c9c7d2 100644
--- a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Reload.java
+++ b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Reload.java
@@ -26,7 +26,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Watch.java b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Watch.java
index 94e2526ef6..f82c7d40ba 100644
--- a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Watch.java
+++ b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/Watch.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/WatcherThread.java b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/WatcherThread.java
index ec56d559c7..4f22b90eb4 100644
--- a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/WatcherThread.java
+++ b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/WatcherThread.java
@@ -45,7 +45,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/WatchingRefresherThread.java b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/WatchingRefresherThread.java
index 172a7cb9ca..23da78f35d 100644
--- a/rapidoid-watch/src/main/java/org/rapidoid/io/watch/WatchingRefresherThread.java
+++ b/rapidoid-watch/src/main/java/org/rapidoid/io/watch/WatchingRefresherThread.java
@@ -29,7 +29,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-watch/src/test/java/org/rapidoid/io/watch/WatchServiceTest.java b/rapidoid-watch/src/test/java/org/rapidoid/io/watch/WatchServiceTest.java
index 3d3cc006f0..ed251c2414 100644
--- a/rapidoid-watch/src/test/java/org/rapidoid/io/watch/WatchServiceTest.java
+++ b/rapidoid-watch/src/test/java/org/rapidoid/io/watch/WatchServiceTest.java
@@ -33,7 +33,7 @@
 import org.rapidoid.io.IO;
 import org.rapidoid.log.Log;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java
index 60c44efed6..d347e42d6f 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java
@@ -26,8 +26,8 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.http.HttpExchange;
+import org.rapidoid.u.U;
 import org.rapidoid.util.D;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.2.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractWidget.java
index a1fb600610..e611930df3 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractWidget.java
@@ -26,8 +26,8 @@
 import org.rapidoid.html.TagWidget;
 import org.rapidoid.html.impl.TagRenderer;
 import org.rapidoid.http.HttpExchange;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java
index f78c309cb1..704a75af32 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java
@@ -36,8 +36,8 @@
 import org.rapidoid.model.Property;
 import org.rapidoid.plugins.db.DB;
 import org.rapidoid.security.DataPermissions;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Rnd;
-import org.rapidoid.util.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.var.Var;
 import org.rapidoid.widget.impl.ArrayContainerVar;
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/ButtonWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/ButtonWidget.java
index 6f0f79fa20..07049c1127 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/ButtonWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/ButtonWidget.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.html.Tag;
 import org.rapidoid.html.tag.ButtonTag;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.3.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/CardWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/CardWidget.java
index a50551aaee..e2b7544262 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/CardWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/CardWidget.java
@@ -23,7 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.html.Tag;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.4.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/DebugWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/DebugWidget.java
index 885afafa83..317b7657f1 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/DebugWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/DebugWidget.java
@@ -26,7 +26,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.3.1")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormFieldWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/FormFieldWidget.java
index 0d63819245..25ae10705d 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormFieldWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/FormFieldWidget.java
@@ -44,7 +44,7 @@
 import org.rapidoid.model.Property;
 import org.rapidoid.plugins.db.DB;
 import org.rapidoid.security.DataPermissions;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 import org.rapidoid.var.Vars;
 import org.rapidoid.wire.Wire;
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/FormWidget.java
index 67890f3f4e..d44eb5833f 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/FormWidget.java
@@ -33,7 +33,7 @@
 import org.rapidoid.model.Item;
 import org.rapidoid.model.Property;
 import org.rapidoid.security.Secure;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.var.Var;
 import org.rapidoid.webapp.AppCtx;
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java
index 76130dccfa..989ca91478 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java
@@ -29,7 +29,7 @@
 import org.rapidoid.model.Item;
 import org.rapidoid.model.Items;
 import org.rapidoid.model.Property;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightWidget.java
index 5baa03fef7..9a89e44af7 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightWidget.java
@@ -27,7 +27,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.html.Tag;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/LayoutWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/LayoutWidget.java
index c53066c04d..550746d638 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/LayoutWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/LayoutWidget.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.html.Tag;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.3.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/SnippetWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/SnippetWidget.java
index 0790af83bb..46dd380167 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/SnippetWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/SnippetWidget.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.html.Tag;
 import org.rapidoid.lambda.Mapper;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.3.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/StreamWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/StreamWidget.java
index adbe3d79e2..749ea7266d 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/StreamWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/StreamWidget.java
@@ -23,7 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.html.Tag;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.3.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/CollectionContainerVar.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/CollectionContainerVar.java
index 686d8a7269..39d27d3d30 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/CollectionContainerVar.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/CollectionContainerVar.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.anyobj.AnyObj;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/EqualityVar.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/EqualityVar.java
index 11bae95645..6215d5f0c7 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/EqualityVar.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/EqualityVar.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/MultiLanguageWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/MultiLanguageWidget.java
index 746d376925..ae332ac349 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/MultiLanguageWidget.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/MultiLanguageWidget.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/WidgetVar.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/WidgetVar.java
index d14454c565..495a0c372f 100644
--- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/WidgetVar.java
+++ b/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/WidgetVar.java
@@ -27,7 +27,7 @@
 import org.rapidoid.cls.Cls;
 import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.http.HttpExchange;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.impl.AbstractVar;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-wire/src/main/java/org/rapidoid/wire/Wire.java b/rapidoid-wire/src/main/java/org/rapidoid/wire/Wire.java
index 1914ab5266..ad5034b768 100644
--- a/rapidoid-wire/src/main/java/org/rapidoid/wire/Wire.java
+++ b/rapidoid-wire/src/main/java/org/rapidoid/wire/Wire.java
@@ -45,7 +45,7 @@
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.0.0")
diff --git a/rapidoid-x-buffer/src/main/java/org/rapidoidx/buffer/MultiBuf.java b/rapidoid-x-buffer/src/main/java/org/rapidoidx/buffer/MultiBuf.java
index 3d05e5ad9e..18cac5ddea 100644
--- a/rapidoid-x-buffer/src/main/java/org/rapidoidx/buffer/MultiBuf.java
+++ b/rapidoid-x-buffer/src/main/java/org/rapidoidx/buffer/MultiBuf.java
@@ -31,9 +31,9 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.arr.Arr;
 import org.rapidoid.pool.Pool;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.D;
-import org.rapidoid.util.U;
 import org.rapidoid.wrap.LongWrap;
 import org.rapidoidx.bytes.ByteBufferBytes;
 import org.rapidoidx.bytes.Bytes;
diff --git a/rapidoid-x-buffer/src/main/java/org/rapidoidx/bytes/BytesUtil.java b/rapidoid-x-buffer/src/main/java/org/rapidoidx/bytes/BytesUtil.java
index 681ed86014..856865ae74 100644
--- a/rapidoid-x-buffer/src/main/java/org/rapidoidx/bytes/BytesUtil.java
+++ b/rapidoid-x-buffer/src/main/java/org/rapidoidx/bytes/BytesUtil.java
@@ -23,8 +23,8 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.wrap.LongWrap;
 import org.rapidoidx.data.Range;
diff --git a/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/KeyValueRanges.java b/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/KeyValueRanges.java
index c171b03501..5164f6c07d 100644
--- a/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/KeyValueRanges.java
+++ b/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/KeyValueRanges.java
@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoidx.buffer.Buf;
 import org.rapidoidx.bytes.BytesUtil;
diff --git a/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/Range.java b/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/Range.java
index 5b9839d479..2b3cf29bab 100644
--- a/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/Range.java
+++ b/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/Range.java
@@ -23,7 +23,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.buffer.Buf;
 import org.rapidoidx.bytes.Bytes;
 import org.rapidoidx.bytes.BytesUtil;
diff --git a/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/Ranges.java b/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/Ranges.java
index fd42c0b888..ce3f50e359 100644
--- a/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/Ranges.java
+++ b/rapidoid-x-buffer/src/main/java/org/rapidoidx/data/Ranges.java
@@ -26,7 +26,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.buffer.Buf;
 import org.rapidoidx.bytes.Bytes;
 import org.rapidoidx.bytes.BytesUtil;
diff --git a/rapidoid-x-buffer/src/test/java/org/rapidoidx/buffer/BufTest.java b/rapidoid-x-buffer/src/test/java/org/rapidoidx/buffer/BufTest.java
index ba7b485662..0f1d651842 100644
--- a/rapidoid-x-buffer/src/test/java/org/rapidoidx/buffer/BufTest.java
+++ b/rapidoid-x-buffer/src/test/java/org/rapidoidx/buffer/BufTest.java
@@ -24,9 +24,9 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.Rnd;
-import org.rapidoid.util.U;
 import org.rapidoidx.bytes.BytesUtil;
 import org.rapidoidx.data.Range;
 import org.rapidoidx.data.Ranges;
diff --git a/rapidoid-x-buffer/src/test/java/org/rapidoidx/buffer/StatisticalBufTest.java b/rapidoid-x-buffer/src/test/java/org/rapidoidx/buffer/StatisticalBufTest.java
index 627f1c8f56..d4609d2b27 100644
--- a/rapidoid-x-buffer/src/test/java/org/rapidoidx/buffer/StatisticalBufTest.java
+++ b/rapidoid-x-buffer/src/test/java/org/rapidoidx/buffer/StatisticalBufTest.java
@@ -24,7 +24,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompilation.java b/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompilation.java
index 1479639cfc..6c97d37114 100644
--- a/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompilation.java
+++ b/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompilation.java
@@ -34,7 +34,7 @@
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.compile.CodeDiagnostic;
 import org.rapidoidx.compile.Compilation;
 
diff --git a/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompilationUnit.java b/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompilationUnit.java
index 54c1236869..28f5927c93 100644
--- a/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompilationUnit.java
+++ b/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompilationUnit.java
@@ -27,7 +27,7 @@
 import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompiler.java b/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompiler.java
index 85ee4c5efe..10247271c0 100644
--- a/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompiler.java
+++ b/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/EcjCompiler.java
@@ -31,7 +31,7 @@
 import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.compile.Compilation;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/SimpleNameEnvironment.java b/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/SimpleNameEnvironment.java
index e39ecd89d7..db22cc345f 100644
--- a/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/SimpleNameEnvironment.java
+++ b/rapidoid-x-compile/src/main/java/org/rapidoidx/compile/impl/SimpleNameEnvironment.java
@@ -29,7 +29,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.io.IO;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-compile/src/test/java/org/rapidoidx/compile/CompileTest.java b/rapidoid-x-compile/src/test/java/org/rapidoidx/compile/CompileTest.java
index fbbc7bf662..20c40b6f81 100644
--- a/rapidoid-x-compile/src/test/java/org/rapidoidx/compile/CompileTest.java
+++ b/rapidoid-x-compile/src/test/java/org/rapidoidx/compile/CompileTest.java
@@ -30,8 +30,8 @@
 import org.rapidoid.cls.Cls;
 import org.rapidoid.io.IO;
 import org.rapidoid.test.TestCommons;
+import org.rapidoid.u.U;
 import org.rapidoid.util.D;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbColumnImpl.java b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbColumnImpl.java
index 670ef12fb0..7757812b7a 100644
--- a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbColumnImpl.java
+++ b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbColumnImpl.java
@@ -27,7 +27,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.beany.SerializableBean;
 import org.rapidoid.cls.Cls;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.DbColumn;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbProxy.java b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbProxy.java
index f8c09180ee..9e72aa6438 100644
--- a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbProxy.java
+++ b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbProxy.java
@@ -32,7 +32,7 @@
 import org.rapidoid.beany.Beany;
 import org.rapidoid.cls.Proxies;
 import org.rapidoid.entity.IEntity;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.AbstractRichEntity;
 import org.rapidoidx.db.DbColumn;
 import org.rapidoidx.db.DbList;
diff --git a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbRelChangesTracker.java b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbRelChangesTracker.java
index 54d8f18ac1..fb75feed06 100644
--- a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbRelChangesTracker.java
+++ b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbRelChangesTracker.java
@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbRelsCommons.java b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbRelsCommons.java
index e6d8df28d9..0334f78dc9 100644
--- a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbRelsCommons.java
+++ b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbRelsCommons.java
@@ -30,7 +30,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.beany.SerializableBean;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.Database;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbSchemaImpl.java b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbSchemaImpl.java
index 5145e58caf..816ce26210 100644
--- a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbSchemaImpl.java
+++ b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DbSchemaImpl.java
@@ -12,8 +12,8 @@
 import org.rapidoid.cls.Cls;
 import org.rapidoid.entity.IEntity;
 import org.rapidoid.rql.RQL;
+import org.rapidoid.u.U;
 import org.rapidoid.util.English;
-import org.rapidoid.util.U;
 import org.rapidoid.webapp.Scan;
 import org.rapidoidx.db.DbDsl;
 import org.rapidoidx.db.DbSchema;
diff --git a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DefaultDbCollection.java b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DefaultDbCollection.java
index 03ac1c1572..25cd777b75 100644
--- a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DefaultDbCollection.java
+++ b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DefaultDbCollection.java
@@ -27,7 +27,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.Database;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DefaultDbRef.java b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DefaultDbRef.java
index 61d8d5f1a3..0b91fc0e1b 100644
--- a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DefaultDbRef.java
+++ b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/DefaultDbRef.java
@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.Database;
 import org.rapidoidx.db.DbRef;
 
diff --git a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/EntityImpl.java b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/EntityImpl.java
index ded248d832..3805b65f87 100644
--- a/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/EntityImpl.java
+++ b/rapidoid-x-db-impl/src/main/java/org/rapidoidx/db/impl/EntityImpl.java
@@ -32,7 +32,7 @@
 import org.rapidoid.beany.Metadata;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.entity.IEntity;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.AbstractRichEntity;
 import org.rapidoidx.db.DbColumn;
 import org.rapidoidx.db.DbList;
diff --git a/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/DbEntityLinks.java b/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/DbEntityLinks.java
index f6cee62544..90e4dcae6c 100644
--- a/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/DbEntityLinks.java
+++ b/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/DbEntityLinks.java
@@ -26,7 +26,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.Database;
 import org.rapidoidx.db.impl.DbRelChangesTracker;
 import org.rapidoidx.db.impl.DbRelsCommons;
diff --git a/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/DbImpl.java b/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/DbImpl.java
index 6d13ecc576..7ee5d2689e 100644
--- a/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/DbImpl.java
+++ b/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/DbImpl.java
@@ -41,7 +41,7 @@
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.rql.ParsedRQL;
 import org.rapidoid.rql.RQL;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.Database;
 import org.rapidoidx.db.DbColumn;
 import org.rapidoidx.db.DbList;
diff --git a/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/JacksonEntitySerializer.java b/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/JacksonEntitySerializer.java
index 0dc2bf555d..4a03879a8c 100644
--- a/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/JacksonEntitySerializer.java
+++ b/rapidoid-x-db-inmem/src/main/java/org/rapidoidx/db/impl/inmem/JacksonEntitySerializer.java
@@ -30,7 +30,7 @@
 import org.rapidoid.beany.Beany;
 import org.rapidoid.beany.Prop;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.Database;
 import org.rapidoidx.db.DbList;
 import org.rapidoidx.db.DbRef;
diff --git a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbClassRelationsTest.java b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbClassRelationsTest.java
index 3b95a4a9cb..5c0db8f6ee 100644
--- a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbClassRelationsTest.java
+++ b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbClassRelationsTest.java
@@ -24,7 +24,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.XDB;
 
 import custom.rapidoidx.db.model.Post;
diff --git a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbEntityPropertiesTest.java b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbEntityPropertiesTest.java
index e430cfa2bc..95b96b7749 100644
--- a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbEntityPropertiesTest.java
+++ b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbEntityPropertiesTest.java
@@ -31,7 +31,7 @@
 import org.rapidoid.beany.Beany;
 import org.rapidoid.beany.Prop;
 import org.rapidoid.cls.TypeKind;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.DbList;
 import org.rapidoidx.db.XDB;
 import org.rapidoidx.db.impl.DbProxy;
diff --git a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbInterfaceRelationsTest.java b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbInterfaceRelationsTest.java
index dcb41cef91..5043a7d81c 100644
--- a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbInterfaceRelationsTest.java
+++ b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbInterfaceRelationsTest.java
@@ -24,7 +24,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.XDB;
 
 import custom.rapidoidx.db.model.IPost;
diff --git a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbProxyTest.java b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbProxyTest.java
index 7d6e2c97cf..9980f0a419 100644
--- a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbProxyTest.java
+++ b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbProxyTest.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.XDB;
 import org.rapidoidx.db.impl.DbProxy;
 
diff --git a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbStatisticalTest.java b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbStatisticalTest.java
index 146f2492de..8319dd7a31 100644
--- a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbStatisticalTest.java
+++ b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbStatisticalTest.java
@@ -32,7 +32,7 @@
 import org.rapidoid.lambda.Operation;
 import org.rapidoid.log.Log;
 import org.rapidoid.log.LogLevel;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.db.XDB;
 
 import custom.rapidoidx.db.model.Person;
diff --git a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbTransactionTest.java b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbTransactionTest.java
index daa4280669..85f5ceac55 100644
--- a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbTransactionTest.java
+++ b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/DbTransactionTest.java
@@ -29,7 +29,7 @@
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.log.Log;
 import org.rapidoid.log.LogLevel;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoidx.db.XDB;
 
diff --git a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/EntityPropertyRetrievalTest.java b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/EntityPropertyRetrievalTest.java
index 41da79efeb..6dbd4e1775 100644
--- a/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/EntityPropertyRetrievalTest.java
+++ b/rapidoid-x-db-tests/src/test/java/custom/rapidoidx/db/EntityPropertyRetrievalTest.java
@@ -27,7 +27,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.beany.Beany;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 import custom.rapidoidx.db.model.IPerson;
 import custom.rapidoidx.db.model.Person;
diff --git a/rapidoid-x-db/src/main/java/org/rapidoidx/db/AbstractRichEntity.java b/rapidoid-x-db/src/main/java/org/rapidoidx/db/AbstractRichEntity.java
index 79652c275e..52a73180a1 100644
--- a/rapidoid-x-db/src/main/java/org/rapidoidx/db/AbstractRichEntity.java
+++ b/rapidoid-x-db/src/main/java/org/rapidoidx/db/AbstractRichEntity.java
@@ -12,7 +12,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.entity.IEntity;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-x-db/src/main/java/org/rapidoidx/db/DBs.java b/rapidoid-x-db/src/main/java/org/rapidoidx/db/DBs.java
index 81bd700ae4..a41453be1e 100644
--- a/rapidoid-x-db/src/main/java/org/rapidoidx/db/DBs.java
+++ b/rapidoid-x-db/src/main/java/org/rapidoidx/db/DBs.java
@@ -27,7 +27,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.lambda.Mapper;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-db/src/main/java/org/rapidoidx/db/XDB.java b/rapidoid-x-db/src/main/java/org/rapidoidx/db/XDB.java
index a5671564f1..a0b9e15206 100644
--- a/rapidoid-x-db/src/main/java/org/rapidoidx/db/XDB.java
+++ b/rapidoid-x-db/src/main/java/org/rapidoidx/db/XDB.java
@@ -34,7 +34,7 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.lambda.Operation;
 import org.rapidoid.lambda.Predicate;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-db/src/main/java/org/rapidoidx/db/XEntity.java b/rapidoid-x-db/src/main/java/org/rapidoidx/db/XEntity.java
index 45ec9f6158..a9d9b54112 100644
--- a/rapidoid-x-db/src/main/java/org/rapidoidx/db/XEntity.java
+++ b/rapidoid-x-db/src/main/java/org/rapidoidx/db/XEntity.java
@@ -8,7 +8,7 @@
 import org.rapidoid.beany.Beany;
 import org.rapidoid.beany.Prop;
 import org.rapidoid.beany.PropertyFilter;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/compile/CompilerBenchmark.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/compile/CompilerBenchmark.java
index 49d1a4ecce..eb79981094 100644
--- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/compile/CompilerBenchmark.java
+++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/compile/CompilerBenchmark.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoid.wrap.IntWrap;
 import org.rapidoidx.compile.Compile;
diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/db/DbCRUDBenchmark.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/db/DbCRUDBenchmark.java
index 6d4063b06f..2bb5b1d315 100644
--- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/db/DbCRUDBenchmark.java
+++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/db/DbCRUDBenchmark.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoidx.db.XDB;
 
diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/AboutScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/AboutScreen.java
index 6aabcb7fbb..bc843e59c7 100644
--- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/AboutScreen.java
+++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/AboutScreen.java
@@ -26,7 +26,7 @@
 import org.rapidoid.app.GUI;
 import org.rapidoid.html.Tag;
 import org.rapidoid.security.annotation.CanInsert;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.ButtonWidget;
 import org.rapidoidx.db.XDB;
 import org.rapidoidx.demo.taskplanner.model.Task;
diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ControlsScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ControlsScreen.java
index 0940178a39..a6bbc2199a 100644
--- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ControlsScreen.java
+++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ControlsScreen.java
@@ -3,7 +3,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.app.GUI;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.LayoutWidget;
 
 /*
diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/MyTasksScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/MyTasksScreen.java
index b3fb93675c..cea4426c33 100644
--- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/MyTasksScreen.java
+++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/MyTasksScreen.java
@@ -31,7 +31,7 @@
 import org.rapidoid.html.Tag;
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.security.annotation.LoggedIn;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.webapp.AppCtx;
 import org.rapidoid.widget.GridWidget;
 import org.rapidoidx.demo.taskplanner.model.Task;
diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java
index 1138fdc894..92e25b85f6 100644
--- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java
+++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java
@@ -30,7 +30,7 @@
 import org.rapidoid.app.GUI;
 import org.rapidoid.html.FieldType;
 import org.rapidoid.html.Tag;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.var.Var;
 import org.rapidoid.widget.FormWidget;
 import org.rapidoid.widget.GridWidget;
diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/MixPage.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/MixPage.java
index aafc764188..7a55e5e153 100644
--- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/MixPage.java
+++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/MixPage.java
@@ -31,7 +31,7 @@
 import org.rapidoid.model.Item;
 import org.rapidoid.model.Items;
 import org.rapidoid.model.Models;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.widget.BootstrapWidgets;
 import org.rapidoid.widget.ButtonWidget;
 import org.rapidoid.widget.GridWidget;
diff --git a/rapidoid-x-http-client/src/main/java/org/rapidoidx/http/client/HttpClientProtocol.java b/rapidoid-x-http-client/src/main/java/org/rapidoidx/http/client/HttpClientProtocol.java
index 5aa72ce813..13aad6a0d8 100644
--- a/rapidoid-x-http-client/src/main/java/org/rapidoidx/http/client/HttpClientProtocol.java
+++ b/rapidoid-x-http-client/src/main/java/org/rapidoidx/http/client/HttpClientProtocol.java
@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoid.util.UTILS;
 import org.rapidoidx.buffer.Buf;
 import org.rapidoidx.data.Range;
diff --git a/rapidoid-x-http-client/src/test/java/org/rapidoidx/http/HttpPipeliningTest.java b/rapidoid-x-http-client/src/test/java/org/rapidoidx/http/HttpPipeliningTest.java
index 05a6ad32b6..05ccf21502 100644
--- a/rapidoid-x-http-client/src/test/java/org/rapidoidx/http/HttpPipeliningTest.java
+++ b/rapidoid-x-http-client/src/test/java/org/rapidoidx/http/HttpPipeliningTest.java
@@ -30,8 +30,8 @@
 import org.rapidoid.http.HttpExchange;
 import org.rapidoid.http.WebServer;
 import org.rapidoid.test.ContextAwareTest;
+import org.rapidoid.u.U;
 import org.rapidoid.util.D;
-import org.rapidoid.util.U;
 import org.rapidoid.wrap.BoolWrap;
 import org.rapidoid.wrap.IntWrap;
 import org.rapidoidx.bytes.BytesUtil;
diff --git a/rapidoid-x-http-client/src/test/java/org/rapidoidx/http/client/HttpClientTest.java b/rapidoid-x-http-client/src/test/java/org/rapidoidx/http/client/HttpClientTest.java
index 8ca4d2706b..c73d1e85cb 100644
--- a/rapidoid-x-http-client/src/test/java/org/rapidoidx/http/client/HttpClientTest.java
+++ b/rapidoid-x-http-client/src/test/java/org/rapidoidx/http/client/HttpClientTest.java
@@ -28,7 +28,7 @@
 import org.rapidoid.http.WebServer;
 import org.rapidoid.lambda.ResultCounterCallback;
 import org.rapidoid.test.ContextAwareTest;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-inmem/src/main/java/org/rapidoidx/inmem/InMem.java b/rapidoid-x-inmem/src/main/java/org/rapidoidx/inmem/InMem.java
index f73a7b969c..1fe7b5edb9 100644
--- a/rapidoid-x-inmem/src/main/java/org/rapidoidx/inmem/InMem.java
+++ b/rapidoid-x-inmem/src/main/java/org/rapidoidx/inmem/InMem.java
@@ -62,9 +62,9 @@
 import org.rapidoid.lambda.Predicate;
 import org.rapidoid.log.Log;
 import org.rapidoid.security.Secure;
+import org.rapidoid.u.U;
 import org.rapidoid.util.OptimisticConcurrencyControlException;
 import org.rapidoid.util.SuccessException;
-import org.rapidoid.util.U;
 import org.rapidoid.webapp.AppCtx;
 import org.rapidoid.webapp.Scan;
 
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/AbstractLoop.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/AbstractLoop.java
index 89b8bb530a..0be87c4be6 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/AbstractLoop.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/AbstractLoop.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/ConnectionTarget.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/ConnectionTarget.java
index a008bbb560..1a106c892e 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/ConnectionTarget.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/ConnectionTarget.java
@@ -26,7 +26,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.net.Protocol;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/DefaultExchange.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/DefaultExchange.java
index cad325e7f8..29ebcd9581 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/DefaultExchange.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/DefaultExchange.java
@@ -28,9 +28,9 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.Resetable;
-import org.rapidoid.util.U;
 import org.rapidoidx.buffer.Buf;
 import org.rapidoidx.buffer.BufProvider;
 import org.rapidoidx.data.BinaryMultiData;
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/FiniteStateProtocol.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/FiniteStateProtocol.java
index d450d02702..87d963f7cb 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/FiniteStateProtocol.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/FiniteStateProtocol.java
@@ -24,8 +24,8 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.LogHP;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 import org.rapidoidx.net.Protocol;
 import org.rapidoidx.net.abstracts.Channel;
 
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/ProtocolBridge.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/ProtocolBridge.java
index c886161540..eaa3186496 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/ProtocolBridge.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/ProtocolBridge.java
@@ -2,7 +2,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.buffer.Buf;
 import org.rapidoidx.net.Protocol;
 import org.rapidoidx.net.abstracts.Channel;
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidChannel.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidChannel.java
index 7acef8bc9e..595d90e1d5 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidChannel.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidChannel.java
@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.net.Protocol;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidClientLoop.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidClientLoop.java
index dc508ca9ad..d829f02526 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidClientLoop.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidClientLoop.java
@@ -30,7 +30,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.config.Conf;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.buffer.BufGroup;
 import org.rapidoidx.net.Protocol;
 import org.rapidoidx.net.TCPClient;
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidConnection.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidConnection.java
index 10413debdd..e448e52b2c 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidConnection.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidConnection.java
@@ -34,9 +34,9 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.Resetable;
-import org.rapidoid.util.U;
 import org.rapidoidx.buffer.Buf;
 import org.rapidoidx.buffer.BufGroup;
 import org.rapidoidx.net.Protocol;
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidServerLoop.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidServerLoop.java
index d2828b95e4..5279622f76 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidServerLoop.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidServerLoop.java
@@ -34,8 +34,8 @@
 import org.rapidoid.cls.Cls;
 import org.rapidoid.config.Conf;
 import org.rapidoid.log.Log;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Rnd;
-import org.rapidoid.util.U;
 import org.rapidoidx.buffer.BufGroup;
 import org.rapidoidx.net.Protocol;
 import org.rapidoidx.net.TCPServer;
diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidWorker.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidWorker.java
index fc50b260e1..26564843c9 100644
--- a/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidWorker.java
+++ b/rapidoid-x-net/src/main/java/org/rapidoidx/net/impl/RapidoidWorker.java
@@ -42,8 +42,8 @@
 import org.rapidoid.measure.StatsMeasure;
 import org.rapidoid.pool.Pool;
 import org.rapidoid.pool.Pools;
+import org.rapidoid.u.U;
 import org.rapidoid.util.SimpleList;
-import org.rapidoid.util.U;
 import org.rapidoidx.buffer.BufGroup;
 import org.rapidoidx.buffer.IncompleteReadException;
 import org.rapidoidx.net.Protocol;
diff --git a/rapidoid-x-net/src/test/java/org/rapidoidx/NetTestCommons.java b/rapidoid-x-net/src/test/java/org/rapidoidx/NetTestCommons.java
index 872bbc612b..f3e39eb513 100644
--- a/rapidoid-x-net/src/test/java/org/rapidoidx/NetTestCommons.java
+++ b/rapidoid-x-net/src/test/java/org/rapidoidx/NetTestCommons.java
@@ -25,7 +25,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.net.Protocol;
 import org.rapidoidx.net.TCP;
 import org.rapidoidx.net.TCPServer;
diff --git a/rapidoid-x-net/src/test/java/org/rapidoidx/TcpClientTest.java b/rapidoid-x-net/src/test/java/org/rapidoidx/TcpClientTest.java
index 9524550b5e..91a86b6ce7 100644
--- a/rapidoid-x-net/src/test/java/org/rapidoidx/TcpClientTest.java
+++ b/rapidoid-x-net/src/test/java/org/rapidoidx/TcpClientTest.java
@@ -26,7 +26,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
 import org.rapidoid.log.LogLevel;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.net.Protocol;
 import org.rapidoidx.net.TCP;
 import org.rapidoidx.net.TCPClient;
diff --git a/rapidoid-x-websocket/src/main/java/org/rapidoidx/websocket/impl/WebSocketProtocol.java b/rapidoid-x-websocket/src/main/java/org/rapidoidx/websocket/impl/WebSocketProtocol.java
index 760e73f141..752b0088f2 100644
--- a/rapidoid-x-websocket/src/main/java/org/rapidoidx/websocket/impl/WebSocketProtocol.java
+++ b/rapidoid-x-websocket/src/main/java/org/rapidoidx/websocket/impl/WebSocketProtocol.java
@@ -26,7 +26,7 @@
 import org.rapidoid.log.Log;
 import org.rapidoid.net.Protocol;
 import org.rapidoid.net.abstracts.Channel;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 import org.rapidoidx.websocket.WSExchange;
 import org.rapidoidx.websocket.WSHandler;
 
diff --git a/rapidoid-x-websocket/src/main/java/org/rapidoidx/websocket/impl/WebSocketUpgrade.java b/rapidoid-x-websocket/src/main/java/org/rapidoidx/websocket/impl/WebSocketUpgrade.java
index 78aa8688ff..a585d20f03 100644
--- a/rapidoid-x-websocket/src/main/java/org/rapidoidx/websocket/impl/WebSocketUpgrade.java
+++ b/rapidoid-x-websocket/src/main/java/org/rapidoidx/websocket/impl/WebSocketUpgrade.java
@@ -27,8 +27,8 @@
 import org.rapidoid.crypto.Crypto;
 import org.rapidoid.http.HttpExchangeImpl;
 import org.rapidoid.http.HttpUpgradeHandler;
+import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
-import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/WorkerActivity.java b/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/WorkerActivity.java
index d8c949542b..f1f7a7d0d6 100644
--- a/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/WorkerActivity.java
+++ b/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/WorkerActivity.java
@@ -5,7 +5,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.lambda.Mapper;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 /*
  * #%L
diff --git a/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/WorkerQueue.java b/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/WorkerQueue.java
index f3b96b855e..b242eacbd5 100644
--- a/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/WorkerQueue.java
+++ b/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/WorkerQueue.java
@@ -25,7 +25,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/Workers.java b/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/Workers.java
index c2af4fa7d3..4d3922b7be 100644
--- a/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/Workers.java
+++ b/rapidoid-x-worker/src/main/java/org/rapidoidx/worker/Workers.java
@@ -27,7 +27,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.lambda.Mapper;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
diff --git a/rapidoid-x-worker/src/test/java/org/rapidoidx/worker/WorkerTest.java b/rapidoid-x-worker/src/test/java/org/rapidoidx/worker/WorkerTest.java
index 78757c5e5a..03ab59e1f2 100644
--- a/rapidoid-x-worker/src/test/java/org/rapidoidx/worker/WorkerTest.java
+++ b/rapidoid-x-worker/src/test/java/org/rapidoidx/worker/WorkerTest.java
@@ -26,7 +26,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.test.TestCommons;
-import org.rapidoid.util.U;
+import org.rapidoid.u.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")