Move demo files in demo/ folder
Make -/+ buttons more intuitive