Updated API calls, organized into directory structure