Restructuring library in preparation for integration