Organizating dependencies and update JSF version.