Reworking of angular architecture, fingers crossed