Fix gruntfile and update file structure