changed the structure of the classes so they wouldn't be accidentally called from and instantiated api class.