Moving resource models to local Resource folder
merge with current working. i hope i'm going to be working on this today.
test suit running again post merge. one failing. working on it.