moving the files into folders a bit