moved parsers to readers
removed models