Updated demo and implementation structure.