Merge "Changing rsg to rs because functions don't rely on graphics. Renaming one of the includes for clarity."