Rename files.
Adjust comments. Remove not needed use classes.