get rid of enumType and use the official one, move my utils to a Utils directory/package, more unused import cleanup