refactoring stories dir, and minor edits