move all data to nontracked folder
merged working version