Removed extraneous twi files, fixed move code