Made some changes in world structure