Final hierarchy change

This’ll make it easier for me to post/find stuff later.