Changed name of ExpansionStore.java to ExpansionStorage.java