Changed name of package. Changed some semantics in utils