move everything around

Curious Kyle @curiouskyle