Adapter Classes for WordPress keeps “growing”

Today I have updated my Adapter Classes plugin and simplified it moving all the functions wrapping WordPress global functions in a single files and all the functions wrapping global variables in another.
Right now I’m using the plugin as a base for more than one plugin and needed to make it work without requiring me to remember where I had put a function.
The image below shows the ideal isolation the adapter classes could offer to a plugin to allow it to live in a real web of objects as OOP would dictate.

Probably related

I appreciate your input