add comments fix from sipin/gorazor
moved files to be consistent with other packages