add group support to income
add group to income
remove file
merge