(SPU) Clean up this struct mess (WIP)