Restructured new libs