Massive reorganisation, pulling everything out of angular