Implemented Source hierarchy

Implemented Source hierarchy, removed ContainerType,, replaced by
SourceType