Move Supervisor constants
Refactor in main, etcd supervisor added
Supervisor work in progress