Restructrured Database
Revert "Restructrured Database"

This reverts commit 2abb8279ebada0c70eb7a47d5ca08c304cde15fe.
Revert "Revert "Restructrured Database""

This reverts commit 87a84ae10ad9d0895675f3559d866a693845fd5e.
Added new tables and columns