A little structure work.. again

Laying out how the code and logic should be structured