Some refactoring of class and filenames