simplify World (and change includes for Resource.h)