w-i-p packag cleanup, fork out xumlib, storable