More refactor type updates. Gruntfile also added..