Refactoring to merge two projects into one