Restructure solution.

Next step, SpecFlow?