Rename exercise directory
Enhance markup
Fix and enhance markup some more