Cleanup and separation of packages