Reorganize & use supervisord for services