Consolidated subclass declarations into main header. Improved init API.