Adding DB class
Updating main files