Allow developers to separate or unify Model & Enity classes, close #2