Move importing from databases
Merge pull request #18 from vidaha/vida/databases2

Move importing from databases