Changes to File Structure

Add Dashes to Folder Names