moved files into new dir structure