Move internal cyclic storage to separate package dir.