Merge "API: Organize classes"