Moved exports around