Enabled new service structure.
Fixed #9.