Housekeeping
edit Description, Namespace and other files
Fixed bug in grouping.