Merge branch 'threaded-application' + refactoring composer dependencies