lib->core, lib/storage->storage