Fix folder structure