Added alerts and changed class layout

Moved classes into one file for now until all things are implemented
then might rearrange into modules