refactored code into models
drop dependency on core
switch to criterium
switched to citerium