Move to 'engine' instead of grunt
Cleanup spacing and method names to indicate privacy
Testing utils
Test for all util methods
Fix bug