incremental refactoring: bring model & collection stuff over and do not use template for the service/processing part