Minor directory reorganization