Backend folder stucture, Item entity, and --upstream merging problem

[Toffa97]

First Check

• I added a very descriptive title here.
• I used the GitHub search to find a similar question and didn't find it.
• I searched the documentation, with the integrated search.
• I already searched in Google "How to X" and didn't find any information.
• I already read and followed all the tutorials in the docs and didn't find an answer.

Example Code

No real code here, just words

Description

I used the template in 4 different project, but in all of them I find the same problem:

• I restructure model / scheme / repos exc in separated folders, eachone about its own related element
• I remove the Item entity cause I do not need it

These 2 actions are kinda boring with git merge --upstream.

Since (my personal opinion) the division in sub folder is more optimal for a big project, why not adopt it instead of using backend/app/crud-models.py files?
Something like

backend/app/model-schema-repo/user.py

Moreover, any suggestion for the --upstream merge? Just do it by hand and do not merge the changes?

Operating System

Linux

Operating System Details

No response

Project Version

last one

Python Version

No response

Additional Context

No response