Arrange files and directories and fix gruntfile.