Few changes

Restructured the database
Few optimizations