Switched to the new Dependency Injection scheme and reorganized packages