fixup! Remove: Further unnecessary classes.
Fix: Flatten namespace for way saner code organisation.