[IMP] improved library module, improved files