Moved installing angular bits to Makefile.
Refactored boundaries a bit.