Slight directory reorganization.