changes to db models and server organization