Refactor

Changed the structure of collection storage.