Moved things around

Everything should still be in here though