Reorganize hole structure