re-build all models and all demos  to use "id" as pk