Move common code into Common project