composer stuff + refactoring
composer stuff + refactoring