Added entity class and normalize movement and speed