More organization work
Fix a bug I introduced