Eliminated 'engines' namspaces for simpler 'logic' namespace