Step 2 towards library-based structure.