Gh further restructure

less segmentation, move all single files to main folder