Move some things around. No functional changes