Done refactoring.
Included the time-grunt plugin for use in testing.