* ServiceManager check method renamed as assert_within_limits * Legacy classes moved to separate files