refactoring some classes
refactoring some classes with structure101