diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index df6cdbf6..9c49c057 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -914,6 +914,7 @@
 		0A5D59C323AD488600EFD9E9 /* Protocols */ = {
 			isa = PBXGroup;
 			children = (
+				D21B7F72243BAC6800051ABF /* CollectionItemModelProtocol.swift */,
 				0A5D59C123AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift */,
 			);
 			path = Protocols;
@@ -1265,7 +1266,6 @@
 				D260105E23D0BFFC00764D80 /* StackItem.swift */,
 				01EB368A23609801006832FA /* MoleculeStackItemModel.swift */,
 				D2FB151C23A40F1500C20E10 /* MoleculeStackItem.swift */,
-				D21B7F72243BAC6800051ABF /* CollectionItemModelProtocol.swift */,
 				D21B7F76243BB70700051ABF /* MoleculeCollectionItemModel.swift */,
 				D2A6390422CBCE160052ED1F /* MoleculeCollectionViewCell.swift */,
 				012A88C1238D7BCA00FE3DA1 /* CarouselItemModel.swift */,
diff --git a/MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionItemModel.swift
index b3d2aba6..b9ac345b 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionItemModel.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-
+/// A model for a collection item that is a container for any molecule.
 @objcMembers open class MoleculeCollectionItemModel: CollectionItemModelProtocol, ContainerModelProtocol, MoleculeModelProtocol {
     open class var identifier: String {
         return "collectionItem"
diff --git a/MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionViewCell.swift b/MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionViewCell.swift
index 0ae515f5..1f615732 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionViewCell.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/MoleculeCollectionViewCell.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 
+/// A collection item that is a container for any molecule.
 open class MoleculeCollectionViewCell: CollectionViewCell {
 
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
diff --git a/MVMCoreUI/BaseClasses/CollectionViewCell.swift b/MVMCoreUI/BaseClasses/CollectionViewCell.swift
index e9857808..a559c93e 100644
--- a/MVMCoreUI/BaseClasses/CollectionViewCell.swift
+++ b/MVMCoreUI/BaseClasses/CollectionViewCell.swift
@@ -18,6 +18,7 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
 
     private var initialSetupPerformed = false
 
+    // MARK: - Inits
     public override init(frame: CGRect) {
         super.init(frame: .zero)
         initialSetup()
@@ -35,6 +36,7 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
         }
     }
     
+    // MARK: - MVMCoreViewProtocol
     open func setupView() {
         isAccessibilityElement = false
         contentView.isAccessibilityElement = false
@@ -56,6 +58,7 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
         backgroundColor = .white
     }
     
+    // MARK: - MoleculeViewProtocol
     open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         guard let model = model as? CollectionItemModelProtocol else { return }
         self.model = model
@@ -71,7 +74,7 @@ open class CollectionViewCell: UICollectionViewCell, MoleculeViewProtocol, MVMCo
         }
     }
     
-    /// Convenience function. Adds the molecule to the view.
+    /// Convenience function. Adds a molecule to the view.
     open func addMolecule(_ molecule: MoleculeViewProtocol) {
         contentView.addSubview(molecule)
         containerHelper.constrainView(molecule)
diff --git a/MVMCoreUI/Atomic/Molecules/Items/CollectionItemModelProtocol.swift b/MVMCoreUI/BaseClasses/Protocols/CollectionItemModelProtocol.swift
similarity index 100%
rename from MVMCoreUI/Atomic/Molecules/Items/CollectionItemModelProtocol.swift
rename to MVMCoreUI/BaseClasses/Protocols/CollectionItemModelProtocol.swift