Reorganizing demo files, rearranging Gruntfile