More edits

directory renaming, overlay edits