Refactor run(), reenable shape optimization

Refactor most of run into tryAddShape(), in mutation.cpp
Refactor optimize*, run() and mutations
Refactor more
Fix Focus bug, add mutations

Fixes #27