More file/directory reorganization.