Big Refactor to two projects