Updated folder structure and removed some testing