Restructure CRUD demo