Start of consolidation into libraries