Revert "Experimental refactoring complete"

This reverts commit bfde490a5746ebac7260f62702c456f9797c364f.
Revert "Mostly everything restructured :scream:"

This reverts commit 6eea820096ca8b355fd9e6aba9b582132d33bdef.
Revert "In the middle of devastating refactoring"

This reverts commit 1dded162fbd8b902f8c922e8d4f1484dcaf0cd30.