changes to build the angular file structure
Merge remote-tracking branch 'alex/pg' into pg
Merge remote-tracking branch 'alex/pg' into pg