Revert "Structural changes that work =D"

This reverts commit d2d5e92d1a3dfb2c7948e150c260948a1968f97f.