starting the next wave of packaging cleanups