Simplifies library structure