Added some tests for placeholder extraction.
Refactored and organised the code a bit.
Added some tests for normalization of predicate logic formulae.