Re-structured folders, completed form and grid.