Reorganize some directories