Exporting

Along with a bunch of misc cleanup & restructuring