minor restructoring and starting of angular