Restructured and added more database tables.