Repacked Service Registration

Repacked the service registration script.