Directory reorganization in advance of Slack compatibility.