Major cleanup of directory structure
Starting to create an alertDao to isolate the relevant DB code