o Moved theory from Theories to Logic
o added type signatures