Adding some comments.
Rename the files to the new structure.
Fix test.