Continued the reshuffling of the directory structure