Refactoring all classes and html file.