clean up formatting, add common files for worker and command, update supper, write router