Move around and rename some classes related to storage