slight reorganization of directories w abs paths
Merge remote-tracking branch 'origin/master'