Refactoring Project to Stream