Reorganize the header directory to distinguish the private headers