Updated files
Implemented declare move logic