API: Organize classes