Remove old supervisor
Rename simple to supervisor
Refactor