Fixed some class / filename inconsistencies Fixed some assets missing scripts Disabled Weather Nuked some old assets that survived the merge