Refactoring to separate projects