Update demo model to new library layout