CORE-5957 Refactoring to support Gin factories
WIP Everything compiled, and ran! Kinda surprised.