Redesigned move class, other changes to adapt to this change