dirclassname variable names unified
memory issue fixed