supervisor service and file management refactor