Added services and migrated some threads and timers to the service infrastructure