Feature/805 project structure

We shouldn't reassign the value of `item`. Let's do it by creating a local variable.