Reorganized to make everything cleaner

Stuff.