Put checks into subdirs
Add EC2 checks