Prepare new file hierarchy.
Fix a typo