More restructuring
Making some progress restructuring things.