update files gruntfile and create directory tasks
update files merge