Refactoring for each of use, using holders for many API methods; cleaning up model packages