moved each chunk of variables in the settings file into their proper folder and finished renaming structure.