moved models to db directory
re-added embedded modules