Separated modular functionality from base plugin and theme objects.