Refactor structure
Add index place holder for demos