Revert "Prototype refactoring"

Reverts simensta/funky-fresh#110