rearranged into separate directories