correct dependencies; service name refactoring; file system restructurig