Moved Entity and World out of Binding