James D. Callahan III:
	- Dead code removal.
	- ADDON_NAME => FOLDER_NAME for consistency.
