Major reshuffling of directory structure