rename data/area -> data/data-area; same for world

This reduces the confusion of having two area.cpp and two area.h; and
same for world.