improve folders structure