First pass refactor into classes. Adjusted gruntfile.