Modified Move struct and removed some silly code.