Correct and move files.
Fix build error.
Remove comments.