changed file and folder naming convention