Move control structures to appropriate location