Fixed screwed up folder structure