Moving storage-related classes to the corresponding files