improving folders structure