Changed how imports are loaded and exported