Moved Database and first cleaning of setup.py. #4052

I deleted all the 'pkg' and 'data' stuff because they were ignored.