files structuring

Suggesting better files structuring for this lib.