changed lib structure