re-structuring
Finished restructuring. Testing next.