Add statements to parser, move some files around