Structure cleanup, potential memory leak fix

[0ffz]

• Use composition to split some engine functions into injectable objects
• Don't schedule entity remove in hopes to fix a memory leak. Regresses some steps in async support but I'm planning a different approach for it in the future