Move utils stuff to a utils module
Meddling with module internals
Release v2.0.4