neat up folder structure