move group to folder
refact all class