Refactor Legacy Module

Incremental refactor plan without breaking public API.