work on adapting gruntfile

morework on overall organization