Imporoving library structure

ararwr