structure adjustment
Merge branch 'angular' of https://github.com/carneades/carneades into angular