moved and merged files