Move common code to common project