update structure and gruntfile