Fixed a bunch of errors in Entity and World

Fixed a bunch of errors caused by both Entity and World including each
other.