ng 1.3, adjusting architecture, etc