Reorganized the shit outta everything

Better imports