add two class in project and refactor some codes