Move Parser into separate library