Moved some stuff around

I forgot to commit this before I forgot what it was.... So anyways
here's the latest files