Restructuring libs