Updated naming convention, deleted 2 not needed files, removed few error prone variables, replaced a variable name in 3 php files to avoid confusion - this resolve #3