#!/usr/bin/env python

from __future__ import print_function
from __future__ import unicode_literals

from tdclient.access_control_model import AccessControl
from tdclient.account_model import Account
from tdclient.bulk_import_model import BulkImport
from tdclient.database_model import Database
from tdclient.job_model import Schema, Job
from tdclient.result_model import Result
from tdclient.schedule_model import ScheduledJob, Schedule
from tdclient.table_model import Table
from tdclient.user_model import User

@@ -108,17 +108,24 @@
 tdclient
-.
+ import 
 access_c
@@ -136,24 +136,38 @@
 ol_model
+%0Afrom tdclient
  import 
 AccessCo
@@ -162,20 +162,20 @@
 ort 
-AccessContro
+account_mode
 l%0Afr
@@ -189,37 +189,69 @@
 ient
-.account_model import Account
+ import bulk_import_model%0Afrom tdclient import database_model
 %0Afro
@@ -264,81 +264,117 @@
 ient
-.bulk_
+ 
 import
+ job
 _model
- import BulkImport%0Afrom tdclient.database_model
+%0Afrom tdclient import result_model%0Afrom tdclient import schedule_model%0Afrom tdclient
  import 
 Data
@@ -373,16 +373,19 @@
 ort 
-Da
 tab
-ase
+le_model
 %0Afro
@@ -398,93 +398,278 @@
 ient
-.job_model import Schema, Job%0Afrom tdclient.result_model import Result%0Afrom tdclient.
+ import user_model%0A%0AAccessControl = access_control_model.AccessControl%0AAccount = account_model.Account%0ABulkImport = bulk_import_model.BulkImport%0ADatabase = database_model.Database%0ASchema = job_model.Schema%0AJob = job_model.Job%0AResult = result_model.Result%0AScheduledJob = 
 sche
@@ -678,24 +678,17 @@
 le_model
- import 
+.
 Schedule
@@ -695,18 +695,17 @@
 dJob
-, 
+%0A
 Schedule
 %0Afro
@@ -704,62 +704,68 @@
 dule
-%0Afrom tdclient.table_model import Table%0Afrom tdclient.
+ = schedule_model.Schedule%0ATable = table_model.Table%0AUser = 
 user
@@ -770,21 +770,14 @@
 er_model
- import 
+.
 User%0A

Fix pylint warnings