Cleaned up the relationship between entity and world.

But collision still doesn't work! Hm.