move files to normal structure