rework storages, change name, namespace.