Reorganized, still a ways to go but I’m happy