Creating more organized modules / classes based on API details