Separation of services

- Changed scaffolding paths for separated services.
- Fixed mistypes in scaffolding output.