directory refactoring, tests ok
all works, but ruter
refactor using exernal Injector