Move state out of cloud directory, remove whitehat
Factor different abstractions out