Moving stuff around to better contain amazon and es functionality, bit of doc