Some directory reorganization.