Refactor to split services into different daemons