All explicit export lists, and moved stuff around