Organize code and demo