fix typo
Move exercises around
unmerged files