Reorganize to isolate exercises

I want to be able to see at a glance which exercises have been
implemented.