Remove 'Subject' from Folder Path

"Subject" is not required in folder_path anymore.