rearrange so bundler can load it correctly