#7 #1 Handle identifier sanitizing and folder naming correctly