better grouping of org settings
delete generated file