Add Move class and moved all related functions there