Update structure and redid the project module logic.