Fixed up folder structure