Fix folders and parser