Revert "Added DiagramContainer and DiagramObject Classes"

This reverts commit a1ab94a11a9ac269dc9c2bce092ed30b52db3855.