Refactor

Refactor the project,