moving stuff around

Moving stuff around to make more sense