rearranged directory a bit