Updated library structure.