merged folders webmachine-engine and engine

Former-commit-id: b82a988c718d3748d5170af0432ad36bed22efa6