Move some declarations around