Confusing Scenario (Business vs Passive Income)

I have a bit of a complicated business and I'm trying to figure out the correct way to file. I work with a small group of individuals, and we do research on missing royalty and gas owners. We sometimes partner with them to fix their title issues, and sometimes we purchase this interest. The initial part of this is an investment and takes capital to complete. Once this is done, we normally receive a check for money that has been sitting getting collected, and then moving forward a royalty month by month (depending on production of minerals). 

I receive a lot of 1099-MISC from the producers of the minerals. Some of these are deals we have done years back, and are completely passive income. Others are ones we completed last year, that has business expenses. Those business expenses, I want to be sure I am deducting for correctly. 

Is it appropriate to add the 1099-MISC that were business deals done for 2023 to my Self-employment income, and then the 1099-MISC that happened in the previous years to passive income section where most 1099-MISC go?