Allow engines to live in lib/. Clean up, remove unneeded complexity.
Merge pull request #900 from jonhattan/engines-in-lib

Allow engines to live in lib/