Reorganization, prefer ^:private to defn-
Merge branch 'master' of github.com:monsanto/smogon-redux