folder structure improvement