Fixes #97, refactor utils/
Only source file that implements invoked command