updated to seperate folder naming and generating