Update organization of utility classes