HedgeHog.Core refactoring