optimize folder structure