Changes organisation of parser