Moved collections diagrams to relevant file
Renamed containers to more accurate collections