Change launch location in gruntfile
Tidy up and sort out build