Renaming a folder, misc updates

@ajself