Fix all problems with foreign key constraints, rename model
Remove old DB model file