commit refactor classes

héhé