Reorganizing angular stuff into more modular components