Repackaged for cleaner build