chore

some small refactorings/updates/cleanups

- [ ] move directives/services into func related submodules