restructured file with OrgStruct
major restructuring almost done
concluding merge