test directory reorganization.