Fixed #30

Moved cloud variables and functions to separate packages