consolidate all partial declarations into Base folder