modification to having correct naming concention and to have correct directory path