Moved the resolvers into a similar structure as the dependencies - makes it easier to add new ones.