My version:
Also has some other ideas for folds.
Some more mechanical origami with applications
A review of origami applications in mechanical engineering (Turner, Goodwine & Sen).
I'm now trying to get the square switch working. This is the current version I'm working on: