Re-organization and update