Restructure and reorganize classes and methods.