move code from root
fixed move