Rename files.
Refactoring.
fixes #2