Refactoring

By Java convention, class names start with a capital letter.