First stages of new setup for more modular export process.