Equation framework WIP
Refactor: fix package hierarchy