Refactoring: renamed some files and classes