Fix structure for library