one last quick restructure