Reorganized all the things

ALL THE THINGS!