updated db - moved init and models to sane places