reorganized the directory a bit