move files properly so history is maintained