move stuff around so bundler will require the correct stuff