Simon ‘corecode’ Schubert had some trouble with the changed src layout while working on gcc 4.1.  Matthew Dillon is changing it back, Wednesday.  (So no commits on Wednesday, please.)  This naming issue is apparently not new.