Updated controller modules + directive