More restructuring.
Final stuff for today!