Renamed IfThen / IfThenElse to IfThenStatement / IfThenElseStatement
Moved error classes to new sub package