updated controllers structure