Refactor Work in Progress

Please see https://github.com/virgo-agent-toolkit/virgo-base-agent/pull/89 for more