Major change

Reorganized a bunch of stuff