f88ef34060
and bios.S were small enough and have been merged back into their respective files in biosboot/, conditionalized on CDBOOT. Other files might be merged at a later stage. Caveat emptor: i cannot test this right now.