This should not be here
Parser done (needs testing), restructured project