Epic reshuffling to (hopefully) build a cleaner output library.