Fix angular controllers modularization