initial commit
Restructure model to new design