First set of changes incorporating new structure of source tree. It also applies some of changes planned as part of buried headers feature #25 Work in progress, requires testing before merging into develop branch