Yeah, these are taking place before BoG. I'm pretty sure Toriyama said somewhere that he wasn't able to flesh out both movies as much as he wanted so he's just replicating them in the series. It'd be pretty confusing if he didn't. Just disregard the movies as being canon now.
I'm about to go watch episode two :0