Restructure exports