Moved some things around

See summary