Organized files.
Moving functions back into mixins

Moving this back, I think I've begun making this too complex.
Reordering imports

Playing with the order of imports.