moved files to flat structure