DeployableMatching refactor

Refactor deployable matching logic to a separate lib