Refactor to use package rather than supervisor and misc other changes