simplify and standardize name of the shaded package
move variables in Main to Util to avoid bad pattern