Move variable to correct class