Better organization
Move resolve into a module