[W.I.P.] Refactoring util packages #140

related #140

Now, working in progress.