Re-factoring to make solution a single project