Simplify resolvers
Move main project back to root