Merge change 3730 into donut

* changes:
  Restructuring the TTS files so that it works as a Service