refactor

splitting services.
Fixing unsatisfied dependencies