ExpirationManager moved to outer namespace
FetchedJobsWatcher and state handlers moved to outer namespace