Complete Reestructuration and JavaDoc Comments