Pseudo-Revert "Changing how 'modules' are done. WIP."

I didn't like what I was doing. :(
Still left some nice bugfixes and small new features in there