update folder structure to new gruntfile and folder structure