Fixed broken folder structure