(NO COMIPLE) saving state of refactoring
finished main refactoring for query / finder / model code