Gh further restructure

les segmentation, move all single files to main folder