Code Organization and cleanup

[timothyjoh]

This refactor
#2

IMO makes the code more manageable and easier to understand and work with. I get that it was largely generated by AI, but doing this made it easier for me to wrap my brain around, and hopefully be able to add tooling from the community in the near future.