Renamed RB files again, cleaned up gruntfile