More restructuring
Missed commit