Category structure updated. Existing topics and hotspots were kept.