(re)Organize

In response, organize differently