Placed resolvers in seperate file. Fixed references to resolvers.
small fixes