Made the folder names simpler