CSIT-678: Re-organize L2 libraries - performance