Reorganising the structure, adding grunt.