Add JSF2 to project.
Refactor some code.