Try fixing binfile hierarchy