Package cleanup.
Further cleanup.
Further cleanup, barebone build.