Move some things around, fix WEIntegration checking