Archi with router (clean)
Debug new arch