add location of packages and cleanup