Updated folder structure, still working on bug with duplicate response,