Refactor DataModels
Move IdBase