Change up the storage directory structure