Restructured classes and code. Updated JSF pages