Further organize class structure
Organize +++: Organize Harder
Hopefully done moving things around now