Modifed script for proper folder naming