Moved things around

Moved things around