Refactored Model package out of test folder(s)