better template for grid challenge
better template
fix typo
Move exercises around
unmerge files