huge refactoring. more utility methods in GritUils and change of class and command names.