GPII-872: Corrected Gruntfile and directory layout