Sharing fixed; refactoring for ease of use (using "holder" objects in API); cleaning up model packages