Flattened control even more

Moved Visibility into Collection
(it was internal to him and could cause import errors)