Removed arraylist from grid

And fix moved files.