Add move helper to Entity. Clean up velocity trait