changing directory hierarchy, doc and testing facilities
new hierarchy