Refactored to two projects