changing to the new library layout
the base functions are defined