Package simplification; Define it is a library more clearly