Alerts Structure

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'feature/alerts' into develop