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