Framework restructuring. This really should've been done from day 1.