Restructure exports to allow imports to work