FEATURE: Major refactor to transform structure