Updated lib structure