Re-organize code + update Gruntfile
update README