fix folder structure, make_dump and parse works