Put unit movement into own class