Created folders and moved variables into them