Made folder structure consistent with api-py