[General] Restructured internal class architecture.