[FIX] some more borrow feature file splitting