new structure for database and server