My main is now like this.
enter image description here
I want to change it to a package structure and located all my files like this.
enter image description here
Hence, I’ve tried it on a branch and everything works. I would like to replace it with the main.

Basically I’ve put all my files in the StoryApp folder, and left only the StoryApp.py(I changed the name to run.py)outside the folder. I’ve added a routes.py and move all my route coding in run.py into it. Also, I’ve create a models.py too. Import statements are also changed.

Now, if I push my branch to GitHub and merge , it will definitely has merge conflict due to the different folder structure. How can I do? (My branch that I am going to push is what I want it to be.)

Really need help on it, thanks’ a lot