Move rotation into Entity