moved angular stuff to proper place