Some updates and directory renaming.