Adding Angularized organizations. Refactored some common  methods