Issue #17: renamed some files