Refactor bundler-directory