added logical models
moved restriction to physical folder
fixed tests to include restriction associations