Refactor 1.0 - grunt tools and service validator.