reorganize files and added an gapping on the grid blocks