* Moved the *Util classes to the util package
+ Added Nullable and NotNull annotations, so that no external depencencies are needed