Update package helper files

Move some files around