Recode to use dictionary directly, restructure folder