reorganize classes
fix typo