Renamed GridPanel's classes