separate services in files
Todo updated
Prepare js tests
Continue with Test preparation