Move globals to proper place