Move physics into Entity