moving to new structure...
running, looks ok, check next
merged branch manifoldstructure