Component refactoring and upgrade PrimeFaces to 4.0