Feature/805 project structure

It's not a good practice to override a parameter, create a local variable to default `parentId` to `null`