Changed the folder naming convention