Re-organized form and content classes