Remove missing argument.
Fix syntax.
Rename some dirs.