Split config and service out to separate files