Completed move of *QWStore.cs