build: rearranged to fit the new binary