move files, simplify dir structure