Removed extra layout folder. Put grids in correct folder. Updated main.