changed lib structure and updated composer.lson