Moved Added variables to correct folders