reorganized the many files into separate dirs