Reorganised the ParsersApp code