refactor model objects and normalize package name