New file structure, new rewritten version of parser