Move variables to separate folder